Skip to content
Snippets Groups Projects
Commit daaf74f1 authored by Mike Frysinger's avatar Mike Frysinger Committed by Wolfgang Denk
Browse files

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: default avatarMike Frysinger <vapier@gentoo.org>
parent 7bd2722e
No related branches found
No related tags found
No related merge requests found
...@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk ...@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
LIB := $(obj)libpcmcia.a LIB := $(obj)libpcmcia.a
COBJS-$(CONFIG_I82365) += i82365.o COBJS-$(CONFIG_I82365) += i82365.o
COBJS-y += mpc8xx_pcmcia.o COBJS-$(CONFIG_8xx) += mpc8xx_pcmcia.o
COBJS-$(CONFIG_PXA_PCMCIA) += pxa_pcmcia.o COBJS-$(CONFIG_PXA_PCMCIA) += pxa_pcmcia.o
COBJS-y += rpx_pcmcia.o COBJS-y += rpx_pcmcia.o
COBJS-$(CONFIG_IDE_TI_CARDBUS) += ti_pci1410a.o COBJS-$(CONFIG_IDE_TI_CARDBUS) += ti_pci1410a.o
......
#include <common.h> #include <common.h>
#if defined(CONFIG_8xx)
#include <mpc8xx.h> #include <mpc8xx.h>
#endif
#include <pcmcia.h> #include <pcmcia.h>
#undef CONFIG_PCMCIA #undef CONFIG_PCMCIA
...@@ -14,7 +12,7 @@ ...@@ -14,7 +12,7 @@
#define CONFIG_PCMCIA #define CONFIG_PCMCIA
#endif #endif
#if defined(CONFIG_8xx) && defined(CONFIG_PCMCIA) #if defined(CONFIG_PCMCIA)
#if defined(CONFIG_IDE_8xx_PCCARD) #if defined(CONFIG_IDE_8xx_PCCARD)
extern int check_ide_device (int slot); extern int check_ide_device (int slot);
...@@ -301,4 +299,4 @@ static u_int m8xx_get_speed(u_int ns, u_int is_io) ...@@ -301,4 +299,4 @@ static u_int m8xx_get_speed(u_int ns, u_int is_io)
} }
#endif /* 0 */ #endif /* 0 */
#endif /* CONFIG_8xx && CONFIG_PCMCIA */ #endif /* CONFIG_PCMCIA */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment