diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 18:02:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 18:02:00 +0000 |
| commit | 02f8110d6a247d53b489b29eec8a35c85e713c6b (patch) | |
| tree | 9cb65032a35c2d1af581deaac73dfa2540b2fbdd /drivers/pcmcia/Makefile | |
| parent | b62a3d8e8a9d02ff6f9103358b7a9c2c3d56c653 (diff) | |
Merge with Linux 2.4.0-test6-pre2.
Diffstat (limited to 'drivers/pcmcia/Makefile')
| -rw-r--r-- | drivers/pcmcia/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile index 649e50a14..b1ac19022 100644 --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile @@ -41,8 +41,11 @@ else M_OBJS += tcic.o endif ifeq ($(CONFIG_CARDBUS),y) + M_OBJS += yenta_socket.o CORE_OBJS += cardbus.o - MX_OBJS += cb_enabler.o yenta.o pci_socket.o + CARDBUS_OBJS := pci_socket.o yenta.o + OX_OBJS += pci_socket.o yenta.o + MX_OBJS += cb_enabler.o endif endif endif @@ -51,3 +54,6 @@ include $(TOPDIR)/Rules.make pcmcia_core.o: $(CORE_OBJS) $(LD) $(LD_RFLAG) -r -o $@ $(CORE_OBJS) + +yenta_socket.o: $(CARDBUS_OBJS) + $(LD) $(LD_RFLAG) -r -o $@ yenta.o pci_socket.o |