diff options
author | Kim Phillips <kim.phillips@freescale.com> | 2009-02-19 11:06:58 -0600 |
---|---|---|
committer | Kim Phillips <kim.phillips@freescale.com> | 2009-02-19 11:06:58 -0600 |
commit | 7511835b29f2074ebfa8ea794f0303ec8e49542b (patch) | |
tree | 0a0f8539a467c897ea0f33ec0b17b8b664e7c7e3 /drivers/pcmcia/Makefile | |
parent | 2b68b23373f96199a0cafbfd7a9f79ed62381ebb (diff) | |
parent | 32482be67775e00b4cbc49fba62347c1ecc6229c (diff) | |
download | u-boot-imx-7511835b29f2074ebfa8ea794f0303ec8e49542b.zip u-boot-imx-7511835b29f2074ebfa8ea794f0303ec8e49542b.tar.gz u-boot-imx-7511835b29f2074ebfa8ea794f0303ec8e49542b.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'drivers/pcmcia/Makefile')
-rw-r--r-- | drivers/pcmcia/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile index ba251d0..babe3ec 100644 --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile @@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk LIB := $(obj)libpcmcia.a COBJS-$(CONFIG_I82365) += i82365.o -COBJS-y += mpc8xx_pcmcia.o +COBJS-$(CONFIG_8xx) += mpc8xx_pcmcia.o COBJS-$(CONFIG_PXA_PCMCIA) += pxa_pcmcia.o COBJS-y += rpx_pcmcia.o COBJS-$(CONFIG_IDE_TI_CARDBUS) += ti_pci1410a.o |