mtd/drivers/mtd/chips Makefile.common,1.3,1.4

[David Woodhouse]

Update of /home/cvs/mtd/drivers/mtd/chips
In directory phoenix.infradead.org:/tmp/cvs-serv25155/chips

Modified Files:
	Makefile.common 
Log Message:
Merge from 2.6


Index: Makefile.common
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/Makefile.common,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.common	25 Sep 2003 14:40:34 -0000	1.3
+++ Makefile.common	12 Jul 2004 16:07:30 -0000	1.4
@@ -3,17 +3,12 @@
 #
 # $Id$
 
-ifeq ($(PATCHLEVEL),4)
-O_TARGET	:= chipslink.o
-export-objs	:= chipreg.o gen_probe.o cfi_util.o
-endif
-
 #                       *** BIG UGLY NOTE ***
 #
 # The removal of get_module_symbol() and replacement with
 # inter_module_register() et al has introduced a link order dependency
 # here where previously there was none.  We now have to ensure that
-# the CFI command set drivers are linked before cfi_probe.o
+# the CFI command set drivers are linked before gen_probe.o
 
 obj-$(CONFIG_MTD)		+= chipreg.o
 obj-$(CONFIG_MTD_AMDSTD)	+= amd_flash.o 
@@ -29,5 +24,3 @@
 obj-$(CONFIG_MTD_ROM)		+= map_rom.o
 obj-$(CONFIG_MTD_SHARP)		+= sharp.o
 obj-$(CONFIG_MTD_ABSENT)	+= map_absent.o
-
--include $(TOPDIR)/Rules.make