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>
This commit is contained in:
Mike Frysinger 2009-01-29 20:02:23 -05:00 committed by Wolfgang Denk
parent 7bd2722e89
commit daaf74f176
2 changed files with 3 additions and 5 deletions

View File

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

View File

@ -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 */