summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-05-18 19:09:52 +0200
committerWolfgang Denk <wd@denx.de>2008-06-26 17:04:25 +0200
commitdfd3be881c03a26e31f0dea4a42e76061fa610ac (patch)
treecd301edfd2aac59d2608c9636dc78feac709d736
parent72d5d5f7b5c74a188df238ec6dd824d80c74857a (diff)
downloadu-boot-imx-dfd3be881c03a26e31f0dea4a42e76061fa610ac.zip
u-boot-imx-dfd3be881c03a26e31f0dea4a42e76061fa610ac.tar.gz
u-boot-imx-dfd3be881c03a26e31f0dea4a42e76061fa610ac.tar.bz2
pcmcia/ti_pci1410a: Move compile condition to the Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
-rw-r--r--drivers/pcmcia/Makefile2
-rw-r--r--drivers/pcmcia/ti_pci1410a.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index 8eb4982..ba251d0 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -29,7 +29,7 @@ COBJS-$(CONFIG_I82365) += i82365.o
COBJS-y += mpc8xx_pcmcia.o
COBJS-$(CONFIG_PXA_PCMCIA) += pxa_pcmcia.o
COBJS-y += rpx_pcmcia.o
-COBJS-y += ti_pci1410a.o
+COBJS-$(CONFIG_IDE_TI_CARDBUS) += ti_pci1410a.o
COBJS-y += tqm8xx_pcmcia.o
COBJS-$(CONFIG_MARUBUN_PCCARD) += marubun_pcmcia.o
diff --git a/drivers/pcmcia/ti_pci1410a.c b/drivers/pcmcia/ti_pci1410a.c
index 208ca50..c876d0c 100644
--- a/drivers/pcmcia/ti_pci1410a.c
+++ b/drivers/pcmcia/ti_pci1410a.c
@@ -64,7 +64,7 @@
#include <pcmcia.h>
-#if defined(CONFIG_CMD_PCMCIA) && defined(CONFIG_IDE_TI_CARDBUS)
+#if defined(CONFIG_CMD_PCMCIA)
int pcmcia_on(int ide_base_bus);
@@ -662,4 +662,4 @@ static int identify(volatile uchar *p)
return 0; /* don't know */
}
-#endif /* CONFIG_IDE_TI_CARDBUS */
+#endif /* CONFIG_CMD_PCMCIA */