mtd/drivers/mtd/maps Config.in,1.59,1.60 Kconfig,1.17,1.18

[trini at infradead.org]

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

Modified Files:
	Config.in Kconfig 
Log Message:
When asking for SBC8240 map support, depend on 6xx && 8260, which is
the proper set of symbols for MPC82xx support.


Index: Config.in
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/Config.in,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- Config.in	21 Oct 2003 13:55:21 -0000	1.59
+++ Config.in	27 Oct 2003 16:37:25 -0000	1.60
@@ -40,12 +40,7 @@
 fi
 
 if [ "$CONFIG_PPC32" = "y" ]; then
-  # CLASSIC_PPC
-  if [ "$CONFIG_8xx" != "y" \
-       -a "$CONFIG_4xx" != "y" \
-       -a "$CONFIG_POWER3" != "y" \
-       -a "$CONFIG_POWER4" != "y" \
-       -a "$CONFIG_PPC_ISERIES" != "y" ]; then
+  if [ "$CONFIG_6xx" = "y" -a "$CONFIG_8260" = "y" ]; then
     dep_tristate '  Flash device on SBC8240' CONFIG_MTD_SBC8240 $CONFIG_MTD_JEDECPROBE
   fi
   if [ "$CONFIG_8xx" = "y" ]; then

Index: Kconfig
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/Kconfig,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Kconfig	26 Oct 2003 21:27:42 -0000	1.17
+++ Kconfig	27 Oct 2003 16:37:25 -0000	1.18
@@ -237,7 +237,7 @@
 
 config MTD_SBC8240
 	tristate "Flash device on SBC8240"
-	depends on PPC32 && MTD_JEDECPROBE && 8xx!=y && 4xx!=y && POWER3!=y && POWER4!=y && PPC_ISERIES!=y
+	depends on PPC32 && MTD_JEDECPROBE && 6xx && 8260
 	help
           Flash access on the SBC8240 board from Wind River.  See
           <http://www.windriver.com/products/sbc8240/>