commit dfd3be881c03a26e31f0dea4a42e76061fa610ac
author Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Sun May 18 19:09:52 2008 +0200
committer Wolfgang Denk <wd@denx.de> Thu Jun 26 17:04:25 2008 +0200
tree cd301edfd2aac59d2608c9636dc78feac709d736
parent 72d5d5f7b5c74a188df238ec6dd824d80c74857a

pcmcia/ti_pci1410a: Move compile condition to the Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

drivers/pcmcia/Makefile

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-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
 

drivers/pcmcia/ti_pci1410a.c

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 @@
 	return 0;	/* don't know */
 }
 
-#endif /* CONFIG_IDE_TI_CARDBUS */
+#endif /* CONFIG_CMD_PCMCIA */