projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with git://www.denx.de/git/u-boot.git
[platform/kernel/u-boot.git]
/
board
/
lwmon
/
pcmcia.c
diff --git
a/board/lwmon/pcmcia.c
b/board/lwmon/pcmcia.c
index
2349286
..
ebca7a2
100644
(file)
--- a/
board/lwmon/pcmcia.c
+++ b/
board/lwmon/pcmcia.c
@@
-5,11
+5,11
@@
#undef CONFIG_PCMCIA
#undef CONFIG_PCMCIA
-#if
(CONFIG_COMMANDS & CF
G_CMD_PCMCIA)
+#if
defined(CONFI
G_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
@@
-127,7
+127,7
@@
int pcmcia_hardware_enable(int slot)
}
}
-#if
(CONFIG_COMMANDS & CF
G_CMD_PCMCIA)
+#if
defined(CONFI
G_CMD_PCMCIA)
int pcmcia_hardware_disable(int slot)
{
volatile immap_t *immap;
int pcmcia_hardware_disable(int slot)
{
volatile immap_t *immap;
@@
-166,7
+166,7
@@
int pcmcia_hardware_disable(int slot)
return (0);
}
return (0);
}
-#endif
/* CFG_CMD_PCMCIA */
+#endif
int pcmcia_voltage_set(int slot, int vcc, int vpp)
int pcmcia_voltage_set(int slot, int vcc, int vpp)