mtd/drivers/mtd/devices Config.in,1.12,1.13 Makefile.24,1.1,1.2

[dmarlin at infradead.org]

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

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/devices/Config.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Config.in	6 Jul 2004 17:39:57 -0000	1.12
+++ Config.in	9 Aug 2004 18:46:04 -0000	1.13
@@ -10,7 +10,7 @@
    bool '    PMC551 256M DRAM Bugfix' CONFIG_MTD_PMC551_BUGFIX
    bool '    PMC551 Debugging' CONFIG_MTD_PMC551_DEBUG
 fi
-if [ "$CONFIG_DECSTATION" = "y" ]; then
+if [ "$CONFIG_MACH__DECSTATION" = "y" ]; then
    dep_tristate '  DEC MS02-NV NVRAM module support' CONFIG_MTD_MS02NV $CONFIG_MTD
 fi
 dep_tristate '  Uncached system RAM' CONFIG_MTD_SLRAM $CONFIG_MTD
@@ -28,8 +28,8 @@
 dep_tristate '  MTD emulation using block device' CONFIG_MTD_BLKMTD $CONFIG_MTD
 
 comment 'Disk-On-Chip Device Drivers'
-   dep_tristate '  M-Systems Disk-On-Chip 2000 and Millennium' CONFIG_MTD_DOC2000 $CONFIG_MTD
-   dep_tristate '  M-Systems Disk-On-Chip Millennium-only alternative driver (see help)' CONFIG_MTD_DOC2001 $CONFIG_MTD
+   dep_tristate '  M-Systems Disk-On-Chip 2000 and Millennium (DEPRECIATED)' CONFIG_MTD_DOC2000 $CONFIG_MTD
+   dep_tristate '  M-Systems Disk-On-Chip Millennium-only alternative driver (DEPRECIATED)' CONFIG_MTD_DOC2001 $CONFIG_MTD
    dep_tristate '  M-Systems Disk-On-Chip Millennium Plus driver (see help)' CONFIG_MTD_DOC2001PLUS $CONFIG_MTD
    if [ "$CONFIG_MTD_DOC2001PLUS" = "y" -o "$CONFIG_MTD_DOC2001" = "y" -o "$CONFIG_MTD_DOC2000" = "y" ]; then
       define_bool CONFIG_MTD_DOCPROBE y

Index: Makefile.24
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/devices/Makefile.24,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.24	12 Jul 2004 16:08:16 -0000	1.1
+++ Makefile.24	9 Aug 2004 18:46:04 -0000	1.2
@@ -7,5 +7,17 @@
 O_TARGET	:= devlink.o
 export-objs	:= docecc.o
 
-include Makefile.common
+obj-$(CONFIG_MTD_DOC2000)       += doc2000.o
+obj-$(CONFIG_MTD_DOC2001)       += doc2001.o
+obj-$(CONFIG_MTD_DOC2001PLUS)   += doc2001plus.o
+obj-$(CONFIG_MTD_DOCPROBE)      += docprobe.o
+obj-$(CONFIG_MTD_DOCECC)        += docecc.o
+obj-$(CONFIG_MTD_SLRAM)         += slram.o
+obj-$(CONFIG_MTD_PHRAM)         += phram.o
+obj-$(CONFIG_MTD_PMC551)        += pmc551.o
+obj-$(CONFIG_MTD_MS02NV)        += ms02-nv.o
+obj-$(CONFIG_MTD_MTDRAM)        += mtdram.o
+obj-$(CONFIG_MTD_LART)          += lart.o
+obj-$(CONFIG_MTD_BLKMTD)        += blkmtd-24.o
+
 include $(TOPDIR)/Rules.make