mtd/drivers/mtd/maps Config.in,1.65,1.66

[ppopov at infradead.org]

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

Modified Files:
	Config.in 
Log Message:
Fixed the 2.4 style Config.in for the Pb1X boards. The defines now
match those in Kconfig and the Makefile.common.


Index: Config.in
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/Config.in,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- Config.in	23 Mar 2004 07:33:19 -0000	1.65
+++ Config.in	31 Mar 2004 07:55:16 -0000	1.66
@@ -68,14 +68,14 @@
 fi
 
 if [ "$CONFIG_MIPS" = "y" -o "$CONFIG_MIPS64" = "y" ]; then
-   dep_tristate '  Pb1000 boot flash device' CONFIG_MTD_PB1000 $CONFIG_MIPS_PB1000
-   dep_tristate '  Pb1500 MTD support' CONFIG_MTD_PB1500 $CONFIG_MIPS_PB1500
-   dep_tristate '  Pb1100 MTD support' CONFIG_MTD_PB1100 $CONFIG_MIPS_PB1100
-   dep_tristate '  XXS1500 boot flash device' CONFIG_MTD_XXS1500 $CONFIG_MIPS_XXS1500
-   if [ "$CONFIG_MTD_PB1500" = "y" -o "$CONFIG_MTD_PB1500" = "m" \
-	-o "$CONFIG_MTD_PB1100" = "y" -o "$CONFIG_MTD_PB1100" = "m" ]; then
-      bool '  Pb1[015]00 boot flash device' CONFIG_MTD_PB1500_BOOT 
-      bool '  Pb1[015]00 user flash device (2nd 32MB bank)' CONFIG_MTD_PB1500_USER
+   if [ "$CONFIG_MIPS_PB1000" = "y" -o "$CONFIG_MIPS_PB1100" = "y" -o "$CONFIG_MIPS_PB1500" = "y" ]; then
+      tristate '  Pb1x00 MTD support' CONFIG_MTD_PB1XXX
+   fi
+   if [ "$CONFIG_MTD_PB1XXX" = "y" -o "$CONFIG_MTD_PB1XXX" = "m" ]; then
+      if [ "$CONFIG_MIPS_PB1500" = "y" -o "$CONFIG_MIPS_PB1100" = "y" ]; then
+         bool '  Pb1[15]00 boot flash device' CONFIG_MTD_PB1500_BOOT 
+         bool '  Pb1[15]00 user flash device (2nd 32MB bank)' CONFIG_MTD_PB1500_USER
+      fi
    fi
    if [ "$CONFIG_MIPS_DB1000" = "y" -o "$CONFIG_MIPS_DB1100" = "y" -o "$CONFIG_MIPS_DB1500" = "y" ]; then
       tristate '  Db1x00 MTD support' CONFIG_MTD_DB1X00
@@ -85,6 +85,7 @@
       fi
    fi
    dep_tristate '  Pb1550 MTD support' CONFIG_MTD_PB1550 $CONFIG_MIPS_PB1550
+   dep_tristate '  XXS1500 boot flash device' CONFIG_MTD_XXS1500 $CONFIG_MIPS_XXS1500
    if [ "$CONFIG_MTD_PB1550" = "y" -o "$CONFIG_MTD_PB1550" = "m" ]; then
       bool '  Pb1550 Boot Flash' CONFIG_MTD_PB1550_BOOT
       bool '  Pb1550 User Parameter Flash' CONFIG_MTD_PB1550_USER