summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2008-05-18 19:09:51 +0200
committerWolfgang Denk <wd@denx.de>2008-06-26 17:03:41 +0200
commit72d5d5f7b5c74a188df238ec6dd824d80c74857a (patch)
treec48a7ad024c26f54d70214e02aabc225143f2712
parentc9eff32881fb429101c937cf8c268f1d42e5c2a9 (diff)
downloadbootable_bootloader_goldelico_gta04-72d5d5f7b5c74a188df238ec6dd824d80c74857a.zip
bootable_bootloader_goldelico_gta04-72d5d5f7b5c74a188df238ec6dd824d80c74857a.tar.gz
bootable_bootloader_goldelico_gta04-72d5d5f7b5c74a188df238ec6dd824d80c74857a.tar.bz2
pxa_pcmcia: 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/pxa_pcmcia.c4
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index b09b901..8eb4982 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -27,7 +27,7 @@ LIB := $(obj)libpcmcia.a
COBJS-$(CONFIG_I82365) += i82365.o
COBJS-y += mpc8xx_pcmcia.o
-COBJS-y += pxa_pcmcia.o
+COBJS-$(CONFIG_PXA_PCMCIA) += pxa_pcmcia.o
COBJS-y += rpx_pcmcia.o
COBJS-y += ti_pci1410a.o
COBJS-y += tqm8xx_pcmcia.o
diff --git a/drivers/pcmcia/pxa_pcmcia.c b/drivers/pcmcia/pxa_pcmcia.c
index 65427ef..11d8590 100644
--- a/drivers/pcmcia/pxa_pcmcia.c
+++ b/drivers/pcmcia/pxa_pcmcia.c
@@ -1,8 +1,6 @@
#include <common.h>
#include <config.h>
-#ifdef CONFIG_PXA_PCMCIA
-
#include <pcmcia.h>
#include <asm/arch/pxa-regs.h>
#include <asm/io.h>
@@ -93,5 +91,3 @@ int pcmcia_off (void)
return 0;
}
#endif
-
-#endif /* CONFIG_PXA_PCMCIA */