[Linux-mips-commits]CVS: linux/drivers/pcmcia Config.in,1.1,1.2 Makefile,1.2,1.3

[Paul M. <le...@us...>]

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

Modified Files:
	Config.in Makefile 
Log Message:
Sync with OSS 2.4.14.



Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/pcmcia/Config.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Config.in	2001/09/05 18:30:03	1.1
+++ Config.in	2001/11/06 09:10:22	1.2
@@ -17,6 +17,7 @@
    if [ "$CONFIG_PCI" != "n" ]; then
       bool '  CardBus support' CONFIG_CARDBUS
    fi
+   bool '  i82092 compatible bridge support' CONFIG_I82092
    bool '  i82365 compatible bridge support' CONFIG_I82365
    bool '  Databook TCIC host bridge support' CONFIG_TCIC
    if [ "$CONFIG_HD64465" = "y" ]; then

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/pcmcia/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	2001/11/06 02:57:38	1.2
+++ Makefile	2001/11/06 09:10:22	1.3
@@ -29,6 +29,9 @@
   ifeq ($(CONFIG_I82365),y)
     obj-y += i82365.o
   endif
+  ifeq ($(CONFIG_I82092),y)
+    obj-y += i82092.o
+  endif
   ifeq ($(CONFIG_TCIC),y)
     obj-y += tcic.o
   endif
@@ -40,6 +43,9 @@
     obj-m   := pcmcia_core.o ds.o
     ifeq ($(CONFIG_I82365),y)
       obj-m += i82365.o
+    endif
+    ifeq ($(CONFIG_I82092),y)
+      obj-m += i82092.o
     endif
     ifeq ($(CONFIG_TCIC),y)
       obj-m += tcic.o