patch-2.3.36 linux/drivers/pcmcia/Makefile

• Lines: 33
• Date: Mon Jan 3 16:36:39 2000
• Orig file: v2.3.35/linux/drivers/pcmcia/Makefile
• Orig date: Wed Dec 29 13:13:17 1999

diff -u --recursive --new-file v2.3.35/linux/drivers/pcmcia/Makefile linux/drivers/pcmcia/Makefile
@@ -18,19 +18,16 @@
   O_OBJS   := cistpl.o rsrc_mgr.o bulkmem.o
   OX_OBJS  := ds.o cs.o
   O_TARGET := pcmcia.o
+  ifeq ($(CONFIG_CARDBUS),y)
+    O_OBJS += cardbus.o
+    OX_OBJS += cb_enabler.o yenta.o pci_socket.o
+  endif
   ifeq ($(CONFIG_I82365),y)
     O_OBJS += i82365.o
   endif
   ifeq ($(CONFIG_TCIC),y)
     O_OBJS += tcic.o
   endif
-  ifeq ($(CONFIG_YENTA),y)
-    OX_OBJS += yenta.o pci_socket.o
-  endif
-  ifeq ($(CONFIG_CARDBUS),y)
-    O_OBJS += cardbus.o
-    OX_OBJS += cb_enabler.o
-  endif
 else
   ifeq ($(CONFIG_PCMCIA),m)
      M_OBJS   := pcmcia_core.o 
@@ -45,7 +42,7 @@
     endif
      ifeq ($(CONFIG_CARDBUS),y)
 	CORE_OBJS += cardbus.o
-	MX_OBJS += cb_enabler.o
+	MX_OBJS += cb_enabler.o yenta.o pci_socket.o
      endif
   endif
 endif