diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-01-29 20:02:23 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-02-18 00:51:21 +0100 |
| commit | daaf74f176b548dfd34a9990231f4189201d57ba (patch) | |
| tree | 43429bbfe6a55285c4a0809e790e885b8267fb31 | |
| parent | 7bd2722e890bc877a3c057d7ccddc80451c99939 (diff) | |
| download | u-boot-imx-daaf74f176b548dfd34a9990231f4189201d57ba.zip u-boot-imx-daaf74f176b548dfd34a9990231f4189201d57ba.tar.gz u-boot-imx-daaf74f176b548dfd34a9990231f4189201d57ba.tar.bz2 | |
mpc8xx_pcmcia: move CONFIG_8xx out of .c file and into Makefile
Move the CONFIG_8xx mpc8xx_pcmcia.c protection out of the C file and
into the Makefile so we avoid pointless compiling of the file.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| -rw-r--r-- | drivers/pcmcia/Makefile | 2 | ||||
| -rw-r--r-- | drivers/pcmcia/mpc8xx_pcmcia.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile index ba251d0..babe3ec 100644 --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile @@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk LIB := $(obj)libpcmcia.a COBJS-$(CONFIG_I82365) += i82365.o -COBJS-y += mpc8xx_pcmcia.o +COBJS-$(CONFIG_8xx) += mpc8xx_pcmcia.o COBJS-$(CONFIG_PXA_PCMCIA) += pxa_pcmcia.o COBJS-y += rpx_pcmcia.o COBJS-$(CONFIG_IDE_TI_CARDBUS) += ti_pci1410a.o diff --git a/drivers/pcmcia/mpc8xx_pcmcia.c b/drivers/pcmcia/mpc8xx_pcmcia.c index 95ea5e9..7030574 100644 --- a/drivers/pcmcia/mpc8xx_pcmcia.c +++ b/drivers/pcmcia/mpc8xx_pcmcia.c @@ -1,7 +1,5 @@ #include <common.h> -#if defined(CONFIG_8xx) #include <mpc8xx.h> -#endif #include <pcmcia.h> #undef CONFIG_PCMCIA @@ -14,7 +12,7 @@ #define CONFIG_PCMCIA #endif -#if defined(CONFIG_8xx) && defined(CONFIG_PCMCIA) +#if defined(CONFIG_PCMCIA) #if defined(CONFIG_IDE_8xx_PCCARD) extern int check_ide_device (int slot); @@ -301,4 +299,4 @@ static u_int m8xx_get_speed(u_int ns, u_int is_io) } #endif /* 0 */ -#endif /* CONFIG_8xx && CONFIG_PCMCIA */ +#endif /* CONFIG_PCMCIA */ |