diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-01-16 22:11:08 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-01-16 22:11:08 +0100 |
| commit | e715888010768d1ac313bc0416854e8a941370aa (patch) | |
| tree | c9dce6c79b28aab85b7973eda454ba44e178cad8 /drivers/pcmcia/marubun_pcmcia.c | |
| parent | 4c9e98ace78e7de972adf7da7135a46ec0a4ee7e (diff) | |
| parent | f91d7ae5ca89acf9fa1ed1015dc078cf29581607 (diff) | |
| download | u-boot-imx-e715888010768d1ac313bc0416854e8a941370aa.zip u-boot-imx-e715888010768d1ac313bc0416854e8a941370aa.tar.gz u-boot-imx-e715888010768d1ac313bc0416854e8a941370aa.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-sh
Diffstat (limited to 'drivers/pcmcia/marubun_pcmcia.c')
| -rw-r--r-- | drivers/pcmcia/marubun_pcmcia.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pcmcia/marubun_pcmcia.c b/drivers/pcmcia/marubun_pcmcia.c index 7b112af..2479a66 100644 --- a/drivers/pcmcia/marubun_pcmcia.c +++ b/drivers/pcmcia/marubun_pcmcia.c @@ -25,11 +25,13 @@ #include <pcmcia.h> #include <asm/io.h> -#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) +#undef CONFIG_PCMCIA + +#if defined(CONFIG_CMD_PCMCIA) #define CONFIG_PCMCIA #endif -#if (CONFIG_COMMANDS & CFG_CMD_IDE) +#if defined(CONFIG_CMD_IDE) #define CONFIG_PCMCIA #endif |