projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MPC5xxx: fix some compiler warnings in USB code
[oweals/u-boot.git]
/
drivers
/
mpc8xx_pcmcia.c
diff --git
a/drivers/mpc8xx_pcmcia.c
b/drivers/mpc8xx_pcmcia.c
index 399a719e56593f04478e27c9a387b870e7f0ecf8..8a34cd305474258db521207ecde5528aaabaef6e 100644
(file)
--- a/
drivers/mpc8xx_pcmcia.c
+++ b/
drivers/mpc8xx_pcmcia.c
@@
-6,11
+6,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
@@
-23,7
+23,7
@@
extern int check_ide_device (int slot);
extern int pcmcia_hardware_enable (int slot);
extern int pcmcia_voltage_set(int slot, int vcc, int vpp);
extern int pcmcia_hardware_enable (int slot);
extern int pcmcia_voltage_set(int slot, int vcc, int vpp);
-#if
(CONFIG_COMMANDS & CF
G_CMD_PCMCIA)
+#if
defined(CONFI
G_CMD_PCMCIA)
extern int pcmcia_hardware_disable(int slot);
#endif
extern int pcmcia_hardware_disable(int slot);
#endif
@@
-189,7
+189,7
@@
int pcmcia_on (void)
return rc;
}
return rc;
}
-#if
(CONFIG_COMMANDS & CF
G_CMD_PCMCIA)
+#if
defined(CONFI
G_CMD_PCMCIA)
int pcmcia_off (void)
{
int i;
int pcmcia_off (void)
{
int i;
@@
-221,7
+221,7
@@
int pcmcia_off (void)
pcmcia_hardware_disable(_slot_);
return 0;
}
pcmcia_hardware_disable(_slot_);
return 0;
}
-#endif
/* CFG_CMD_PCMCIA */
+#endif
static u_int m8xx_get_graycode(u_int size)
static u_int m8xx_get_graycode(u_int size)