mtd/drivers/mtd Config.in,1.77,1.78 Makefile.24,1.1,1.2

[dmarlin at infradead.org]

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

Modified Files:
	Config.in Makefile.24 
Log Message:
Updated to allow a build from a 2.4.24 kernel tree.


Index: Config.in
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/Config.in,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- Config.in	4 Jun 2004 15:59:32 -0000	1.77
+++ Config.in	9 Aug 2004 18:46:03 -0000	1.78
@@ -11,7 +11,7 @@
    if [ "$CONFIG_MTD_DEBUG" = "y" ]; then
       int '  Debugging verbosity (0 = quiet, 3 = noisy)' CONFIG_MTD_DEBUG_VERBOSE 0
    fi
-   dep_tristate '  MTD partitioning support' CONFIG_MTD_PARTITIONS $CONFIG_MTD
+   bool '  MTD partitioning support' CONFIG_MTD_PARTITIONS $CONFIG_MTD
    dep_tristate '  MTD concatenating support' CONFIG_MTD_CONCAT $CONFIG_MTD
    dep_tristate '  RedBoot partition table parsing' CONFIG_MTD_REDBOOT_PARTS $CONFIG_MTD_PARTITIONS
    if [ "$CONFIG_MTD_REDBOOT_PARTS" = "y" -o "$CONFIG_MTD_REDBOOT_PARTS" = "m" ]; then

Index: Makefile.24
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/Makefile.24,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.24	12 Jul 2004 16:08:15 -0000	1.1
+++ Makefile.24	9 Aug 2004 18:46:03 -0000	1.2
@@ -4,27 +4,44 @@
 #
 # $Id$
 
+# Core functionality.
+mtd-y				:= mtdcore.o
+mtd-$(CONFIG_MTD_PARTITIONS)	+= mtdpart.o
+obj-$(CONFIG_MTD)		+= $(mtd-y)
+
+obj-$(CONFIG_MTD_CONCAT)        += mtdconcat.o
+obj-$(CONFIG_MTD_PARTITIONS)    += mtdpart.o
+obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
+obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
+obj-$(CONFIG_MTD_AFS_PARTS)     += afs.o
+
+# 'Users' - code which presents functionality to userspace.
+obj-$(CONFIG_MTD_CHAR)          += mtdchar.o
+obj-$(CONFIG_MTD_BLOCK)         += mtdblock.o mtd_blkdevs-24.o
+obj-$(CONFIG_MTD_BLOCK_RO)      += mtdblock_ro.o mtd_blkdevs-24.o
+obj-$(CONFIG_FTL)               += ftl.o mtd_blkdevs-24.o
+obj-$(CONFIG_NFTL)              += nftl.o mtd_blkdevs-24.o
+obj-$(CONFIG_INFTL)             += inftl.o mtd_blkdevs-24.o
+
+nftl-objs               := nftlcore.o nftlmount.o
+inftl-objs              := inftlcore.o inftlmount.o
 
 export-objs	:= mtdcore.o mtdpart.o redboot.o cmdlinepart.o afs.o \
 		   mtdconcat.o mtd_blkdevs-24.o
 
 mtd_blkdevs-objs := mtd_blkdevs-24.o
 
+obj-y		+= chips/chipslink.o maps/mapslink.o \
+		   devices/devlink.o nand/nandlink.o
+
 O_TARGET	:= mtdlink.o
 
-list-multi	:= nftl.o inftl.o mtd_blkdevs.o
+list-multi	:= nftl.o inftl.o mtd_blkdevs-24.o
 
 mod-subdirs	:=
 subdir-y	:= chips maps devices nand
 subdir-m	:= $(subdir-y)
 
-old-obj-y	:= $(obj-y)
-
-include Makefile.common
-
-obj-y		:= $(old-obj-y) chips/chipslink.o maps/mapslink.o \
-		   devices/devlink.o nand/nandlink.o
-
 include $(TOPDIR)/Rules.make
 
 nftl.o: $(nftl-objs)