mtd/drivers/mtd/maps Kconfig,1.13,1.14 Config.in,1.55,1.56

[trini at infradead.org]

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

Modified Files:
	Kconfig Config.in 
Log Message:
Now that the D-Box2 is supported in the kernel (or will be soon),
test for that board before asking about it's map file.


Index: Kconfig
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/Kconfig,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Kconfig	2 Sep 2003 17:59:41 -0000	1.13
+++ Kconfig	22 Sep 2003 16:56:32 -0000	1.14
@@ -265,7 +265,7 @@
 
 config MTD_DBOX2
 	tristate "CFI Flash device mapped on D-Box2"
-	depends on PPC32 && 8xx && MTD_CFI_INTELSTD && MTD_CFI_INTELEXT && MTD_CFI_AMDSTD
+	depends on PPC32 && 8xx && DBOX2 && MTD_CFI_INTELSTD && MTD_CFI_INTELEXT && MTD_CFI_AMDSTD
 	help
 	  This enables access routines for the flash chips on the Nokia/Sagem
 	  D-Box 2 board. If you have one of these boards and would like to use

Index: Config.in
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/Config.in,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- Config.in	2 Sep 2003 17:59:41 -0000	1.55
+++ Config.in	22 Sep 2003 16:56:33 -0000	1.56
@@ -50,7 +50,9 @@
     if [ "$CONFIG_MBX" = "y" ]; then
       dep_tristate '  System flash on MBX860 board' CONFIG_MTD_MBX860 $CONFIG_MTD_CFI
     fi
-    dep_tristate '  CFI Flash device mapped on D-Box2' CONFIG_MTD_DBOX2 $CONFIG_MTD_CFI
+    if [ "$CONFIG_DBOX2" = "y" ]; then
+      dep_tristate '  CFI Flash device mapped on D-Box2' CONFIG_MTD_DBOX2 $CONFIG_MTD_CFI
+    fi
     dep_tristate '  CFI Flash device mapping on FlagaDM' CONFIG_MTD_CFI_FLAGADM $CONFIG_MTD_CFI
   fi
   if [ "$CONFIG_4xx" = "y" ]; then