commit b66f1941b3f5d611506d2ce7e2c09b01a2290bd1
author Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Sun May 18 19:09:51 2008 +0200
committer Wolfgang Denk <wd@denx.de> Thu Jun 26 17:03:41 2008 +0200
tree c48a7ad024c26f54d70214e02aabc225143f2712
parent 1ec80fa4f40cd8bfa49bd4ff56f0904f680be33b

pxa_pcmcia: 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 b09b901..8eb4982 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -27,7 +27,7 @@
 
 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

drivers/pcmcia/pxa_pcmcia.c

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 @@
 	return 0;
 }
 #endif
-
-#endif /* CONFIG_PXA_PCMCIA */