[Linux-mips-commits]CVS: linux/drivers/mtd/maps Config.in,1.2,1.3 Makefile,1.2,1.3 pb1xxx-flash.c,1.2,1.3

[Pete P. <pp...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/mtd/maps
In directory usw-pr-cvs1:/tmp/cvs-serv21160/drivers/mtd/maps

Modified Files:
	Config.in Makefile pb1xxx-flash.c 
Log Message:
Pb1100 updated:
* updated defconfig
* added sound driver and mtd support
* fixed proc output to print correct CPU


Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/mtd/maps/Config.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Config.in	15 Feb 2002 19:47:27 -0000	1.2
+++ Config.in	12 Apr 2002 20:45:07 -0000	1.3
@@ -39,9 +39,11 @@
 if [ "$CONFIG_MIPS" = "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
-   if [ "$CONFIG_MTD_PB1500" = "y" -o "$CONFIG_MTD_PB1500" = "m" ]; then
-      bool '  Pb1500 boot flash device' CONFIG_MTD_PB1500_BOOT 
-      bool '  Pb1500 user flash device (2nd 32MB bank)' CONFIG_MTD_PB1500_USER
+   dep_tristate '  Pb1100 MTD support' CONFIG_MTD_PB1100 $CONFIG_MIPS_PB1100
+   if [ "$CONFIG_MTD_PB1500" = "y" -o "$CONFIG_MTD_PB1500" = "m" \
+	-o "$CONFIG_MTD_PB1100" = "y" -o "$CONFIG_MTD_PB1100" = "m" ]; then
+      bool '  Pb[15]00 boot flash device' CONFIG_MTD_PB1500_BOOT 
+      bool '  Pb[15]00 user flash device (2nd 32MB bank)' CONFIG_MTD_PB1500_USER
    fi
    dep_tristate '  Flash chip mapping on ITE QED-4N-S01B, Globespan IVR or custom board' CONFIG_MTD_CSTM_MIPS_IXX $CONFIG_MTD_CFI $CONFIG_MTD_JEDEC $CONFIG_MTD_PARTITIONS 
    if [ "$CONFIG_MTD_CSTM_MIPS_IXX" = "y" -o "$CONFIG_MTD_CSTM_MIPS_IXX" = "m" ]; then

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/mtd/maps/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	15 Feb 2002 19:47:27 -0000	1.2
+++ Makefile	12 Apr 2002 20:45:07 -0000	1.3
@@ -31,5 +31,6 @@
 obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o
 obj-$(CONFIG_MTD_PB1000)        += pb1xxx-flash.o
 obj-$(CONFIG_MTD_PB1500)        += pb1xxx-flash.o
+obj-$(CONFIG_MTD_PB1100)        += pb1xxx-flash.o
 
 include $(TOPDIR)/Rules.make

Index: pb1xxx-flash.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/mtd/maps/pb1xxx-flash.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pb1xxx-flash.c	15 Feb 2002 19:47:27 -0000	1.2
+++ pb1xxx-flash.c	12 Apr 2002 20:45:07 -0000	1.3
@@ -127,7 +127,7 @@
         }
 };
 
-#elif defined(CONFIG_MIPS_PB1500)
+#elif defined(CONFIG_MIPS_PB1500) || defined(CONFIG_MIPS_PB1100)
 
 static unsigned char flash_buswidth = 4;
 #if defined(CONFIG_MTD_PB1500_BOOT) && defined(CONFIG_MTD_PB1500_USER)