phone-side
/
uboot-mt623x
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

marabun_pcmcia: Move compile condition to the Makefile 

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2008-05-18 19:09:50 +02:00 committed by Wolfgang Denk
parent 914f58c576
commit c9eff32881
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pcmcia/Makefile
View File

@ -31,7 +31,7 @@ COBJS-y += pxa_pcmcia.o
COBJS-y += rpx_pcmcia.o COBJS-y += rpx_pcmcia.o
COBJS-y += ti_pci1410a.o COBJS-y += ti_pci1410a.o
COBJS-y += tqm8xx_pcmcia.o COBJS-y += tqm8xx_pcmcia.o
COBJS-y += marubun_pcmcia.o COBJS-$(CONFIG_MARUBUN_PCCARD) += marubun_pcmcia.o
COBJS := $(COBJS-y) COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c) SRCS := $(COBJS:.o=.c)

7
drivers/pcmcia/marubun_pcmcia.c
View File

@ -31,12 +31,11 @@
#define CONFIG_PCMCIA #define CONFIG_PCMCIA
#endif #endif
#if defined(CONFIG_CMD_IDE) #if defined(CONFIG_CMD_IDE)
#define CONFIG_PCMCIA #define CONFIG_PCMCIA
#endif #endif
#if defined(CONFIG_PCMCIA) \ #if defined(CONFIG_PCMCIA)
&& (defined(CONFIG_MARUBUN_PCCARD))
/* MR-SHPC-01 register */ /* MR-SHPC-01 register */
#define MRSHPC_MODE (CFG_MARUBUN_MRSHPC + 4) #define MRSHPC_MODE (CFG_MARUBUN_MRSHPC + 4)
@ -112,4 +111,4 @@ int pcmcia_off (void)
return 0; return 0;
} }
#endif /* CONFIG_MARUBUN_PCCARD */ #endif /* CONFIG_PCMCIA */