Update of /cvsroot/linux-mips/linux/drivers/pcmcia
In directory usw-pr-cvs1:/tmp/cvs-serv1799/drivers/pcmcia
Modified Files:
Config.in Makefile
Log Message:
Split up the Pb board and Au CPU dependencies properly.
Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/pcmcia/Config.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Config.in 25 Sep 2002 07:38:59 -0000 1.7
+++ Config.in 26 Sep 2002 05:39:40 -0000 1.8
@@ -24,9 +24,9 @@
if [ "$CONFIG_HD64465" = "y" ]; then
dep_tristate ' HD64465 host bridge support' CONFIG_HD64465_PCMCIA $CONFIG_PCMCIA
fi
- if [ "$CONFIG_MIPS_AU1000" = "y" ]; then
- dep_tristate ' Au1x00 pcmcia support' CONFIG_PCMCIA_AU1000 $CONFIG_PCMCIA
- if [ "$CONFIG_PCMCIA_AU1000" != "n" ]; then
+ if [ "$CONFIG_CPU_AU1X00" = "y" ]; then
+ dep_tristate ' Au1x00 PCMCIA support' CONFIG_PCMCIA_AU1X00 $CONFIG_PCMCIA
+ if [ "$CONFIG_PCMCIA_AU1X00" != "n" ]; then
dep_bool ' Pb1x00 board support' CONFIG_PCMCIA_PB1X00
dep_bool ' Hyd1100 support' CONFIG_PCMCIA_HYD1100
fi
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/pcmcia/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile 25 Sep 2002 07:38:59 -0000 1.8
+++ Makefile 26 Sep 2002 05:39:40 -0000 1.9
@@ -59,7 +59,7 @@
endif
endif
-obj-$(CONFIG_PCMCIA_AU1000) += au1x00_ss.o
+obj-$(CONFIG_PCMCIA_AU1X00) += au1x00_ss.o
au1000_ss-objs-y := au1000_generic.o
au1000_ss-objs-$(CONFIG_PCMCIA_PB1X00) += au1000_pb1x00.o
au1000_ss-objs-$(CONFIG_PCMCIA_HYD1100) += au1000_hyd1100.o
|
