projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with /home/wd/git/u-boot/master
[oweals/u-boot.git]
/
drivers
/
rpx_pcmcia.c
diff --git
a/drivers/rpx_pcmcia.c
b/drivers/rpx_pcmcia.c
index 2a0a9e05a27de32688b1d6393ce918a3e3080e87..c7c425b93cf8c67145c2d5f8c1f08459c262cd0c 100644
(file)
--- a/
drivers/rpx_pcmcia.c
+++ b/
drivers/rpx_pcmcia.c
@@
-9,11
+9,11
@@
#undef CONFIG_PCMCIA
#undef CONFIG_PCMCIA
-#if
CONFIG_COMMANDS & CFG_CMD_PCMCIA
+#if
defined(CONFIG_CMD_PCMCIA)
#define CONFIG_PCMCIA
#endif
#define CONFIG_PCMCIA
#endif
-#if
(CONFIG_COMMANDS & CF
G_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
+#if
defined(CONFI
G_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
#define CONFIG_PCMCIA
#endif
#define CONFIG_PCMCIA
#endif
@@
-62,12
+62,12
@@
int pcmcia_hardware_enable (int slot)
return 0; /* No hardware to enable */
}
return 0; /* No hardware to enable */
}
-#if
(CONFIG_COMMANDS & CF
G_CMD_PCMCIA)
+#if
defined(CONFI
G_CMD_PCMCIA)
static int pcmcia_hardware_disable(int slot)
{
return 0; /* No hardware to disable */
}
static int pcmcia_hardware_disable(int slot)
{
return 0; /* No hardware to disable */
}
-#endif
/* CONFIG_COMMANDS & CFG_CMD_PCMCIA */
+#endif
#endif /* CONFIG_PCMCIA && (CONFIG_RPXCLASSIC || CONFIG_RPXLITE) */
#endif /* CONFIG_PCMCIA && (CONFIG_RPXCLASSIC || CONFIG_RPXLITE) */