[Linux-mips-commits]CVS: linux/drivers/pcmcia Config.in,1.4,1.5 Makefile,1.4,1.5 au1000_generic.c,1.7,1.8

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

Update of /cvsroot/linux-mips/linux/drivers/pcmcia
In directory usw-pr-cvs1:/tmp/cvs-serv13922/drivers/pcmcia

Modified Files:
	Config.in Makefile au1000_generic.c 
Log Message:
Pb1100 support.


Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/pcmcia/Config.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Config.in	2 Dec 2001 19:05:32 -0000	1.4
+++ Config.in	2 Apr 2002 22:59:40 -0000	1.5
@@ -25,7 +25,9 @@
       dep_tristate '  HD64465 host bridge support' CONFIG_HD64465_PCMCIA $CONFIG_PCMCIA
    fi
    if [ "$CONFIG_MIPS_AU1000" = "y" ]; then
-      dep_tristate '  AU1000 support' CONFIG_PCMCIA_AU1000 $CONFIG_PCMCIA
+      dep_tristate '  Au1000 support' CONFIG_PCMCIA_AU1000 $CONFIG_PCMCIA $CONFIG_MIPS_PB1000
+      dep_tristate '  Au1500 support' CONFIG_PCMCIA_AU1500 $CONFIG_PCMCIA $CONFIG_MIPS_PB1500
+      dep_tristate '  Au1100 support' CONFIG_PCMCIA_AU1100 $CONFIG_PCMCIA $CONFIG_MIPS_PB1100
    fi
 fi
 

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/pcmcia/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	5 Dec 2001 19:52:53 -0000	1.4
+++ Makefile	2 Apr 2002 22:59:40 -0000	1.5
@@ -60,8 +60,11 @@
 endif
 
 obj-$(CONFIG_PCMCIA_AU1000)			+= au1000_ss.o
+obj-$(CONFIG_PCMCIA_AU1500)			+= au1500_ss.o
 au1000_ss-objs-y				:= au1000_generic.o
 au1000_ss-objs-$(CONFIG_MIPS_PB1000)		+= au1000_pb1000.o
+au1000_ss-objs-$(CONFIG_MIPS_PB1500)		+= au1000_pb1500.o
+au1000_ss-objs-$(CONFIG_MIPS_PB1100)		+= au1000_pb1500.o
 
 obj-$(CONFIG_PCMCIA_SA1100)	+= sa1100_cs.o
 

Index: au1000_generic.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/pcmcia/au1000_generic.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- au1000_generic.c	9 Mar 2002 01:41:24 -0000	1.7
+++ au1000_generic.c	2 Apr 2002 22:59:40 -0000	1.8
@@ -157,6 +157,8 @@
 	pcmcia_low_level=&pb1000_pcmcia_ops;
 #elif defined(CONFIG_MIPS_PB1500)
 	pcmcia_low_level=&pb1500_pcmcia_ops;
+#elif defined(CONFIG_MIPS_PB1100)
+	pcmcia_low_level=&pb1500_pcmcia_ops;
 #else
 #error Unsupported AU1000 board.
 #endif