mtd/drivers/mtd/maps Config.in,1.57,1.58 Kconfig,1.14,1.15

[Thayne Harbaugh]

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

Modified Files:
	Config.in Kconfig 
Log Message:
Fix dependencies and add Kconfig for sbc8240

Index: Config.in
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/Config.in,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- Config.in	30 Sep 2003 16:15:05 -0000	1.57
+++ Config.in	1 Oct 2003 17:37:36 -0000	1.58
@@ -40,8 +40,13 @@
 fi
 
 if [ "$CONFIG_PPC32" = "y" ]; then
-  if [ "$CLASSIC_PPC" = "y" ]; then
-    dep_tristate '  CFI Flash device mapped on SBC8240' CONFIG_MTD_SBC8240 $CONFIG_MTD_JEDECPROBE
+  # CLASSIC_PPC
+  if [ "$CONFIG_8xx" != "y" \
+       -a "$CONFIG_4xx" != "y" \
+       -a "$CONFIG_POWER3" != "y" \
+       -a "$CONFIG_POWER4" != "y" \
+       -a "$CONFIG_PPC_ISERIES" != "y" ]; then
+    dep_tristate '  Flash device on SBC8240' CONFIG_MTD_SBC8240 $CONFIG_MTD_JEDECPROBE
   fi
   if [ "$CONFIG_8xx" = "y" ]; then
     if [ "$CONFIG_TQM8xxL" = "y" ]; then

Index: Kconfig
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/Kconfig,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Kconfig	22 Sep 2003 16:56:32 -0000	1.14
+++ Kconfig	1 Oct 2003 17:37:36 -0000	1.15
@@ -235,6 +235,13 @@
 
 	  BE VERY CAREFUL.
 
+config MTD_SBC8240
+	tristate "Flash device on SBC8240"
+	depends on PPC32 && MTD_JEDECPROBE && 8xx!=y && 4xx!=y && POWER3!=y && POWER4!=y && PPC_ISERIES!=y
+	help
+          Flash access on the SBC8240 board from Wind River.  See
+          <http://www.windriver.com/products/sbc8240/>
+
 config MTD_TQM8XXL
 	tristate "CFI Flash device mapped on TQM8XXL"
 	depends on MTD_CFI && PPC32 && 8xx && TQM8xxL