mtd/drivers/mtd/devices Config.in,1.14,1.15 Kconfig,1.12,1.13

gleixner at infradead.org gleixner at infradead.org
Fri Oct 1 17:47:15 EDT 2004


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

Modified Files:
	Config.in Kconfig 
Log Message:
Remove docecc dependency for the new nand/diskonchip driver

Index: Config.in
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/devices/Config.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Config.in	10 Aug 2004 14:12:29 -0000	1.14
+++ Config.in	1 Oct 2004 21:47:13 -0000	1.15
@@ -41,10 +41,10 @@
       fi
    fi
 
-   if [ "$CONFIG_MTD_DOCPROBE" = "y" -o "$CONFIG_MTD_NAND_DISKONCHIP" = "y" ]; then
+   if [ "$CONFIG_MTD_DOCPROBE" = "y" ]; then
       define_bool CONFIG_MTD_DOCECC y
    else
-      if [ "$CONFIG_MTD_DOCPROBE" = "m" -o "$CONFIG_MTD_NAND_DISKONCHIP" = "m" ]; then
+      if [ "$CONFIG_MTD_DOCPROBE" = "m" ]; then
          define_bool CONFIG_MTD_DOCECC m
       else
          define_bool CONFIG_MTD_DOCECC n

Index: Kconfig
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/devices/Kconfig,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Kconfig	10 Aug 2004 13:12:18 -0000	1.12
+++ Kconfig	1 Oct 2004 21:47:13 -0000	1.13
@@ -193,8 +193,8 @@
 
 config MTD_DOCECC
 	tristate
-	default m if MTD_DOCPROBE!=y && MTD_NAND_DISKONCHIP!=y && (MTD_DOCPROBE=m || MTD_NAND_DISKONCHIP=m)
-	default y if MTD_DOCPROBE=y || MTD_NAND_DISKONCHIP=y
+	default m if MTD_DOCPROBE=m
+	default y if MTD_DOCPROBE=y
 	help
 	  This isn't a real config option; it's derived.
 





More information about the linux-mtd-cvs mailing list