summaryrefslogtreecommitdiff
path: root/drivers/pcmcia/Makefile
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-12-27 01:12:56 +0100
committerWolfgang Denk <wd@denx.de>2007-12-27 01:12:56 +0100
commit81b38be8631a0b809c97ab3d929f491373d7314f (patch)
tree0dd6444e2b602dcd06524f57c234b1f3b18ceb83 /drivers/pcmcia/Makefile
parentf77ac3d657e9b1d40012153e872a2118cca10a3d (diff)
parent29592ecba3b932b9b152bcec6c0c0806412db4a3 (diff)
downloadu-boot-imx-81b38be8631a0b809c97ab3d929f491373d7314f.zip
u-boot-imx-81b38be8631a0b809c97ab3d929f491373d7314f.tar.gz
u-boot-imx-81b38be8631a0b809c97ab3d929f491373d7314f.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-sh
Conflicts: MAINTAINERS Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'drivers/pcmcia/Makefile')
-rw-r--r--drivers/pcmcia/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index 55528c8..bba1ab8 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -30,6 +30,7 @@ COBJS-y += pxa_pcmcia.o
COBJS-y += rpx_pcmcia.o
COBJS-y += ti_pci1410a.o
COBJS-y += tqm8xx_pcmcia.o
+COBJS-y += marubun_pcmcia.o
COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)