projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move coloured led API to status_led.h
[oweals/u-boot.git]
/
drivers
/
eepro100.c
diff --git
a/drivers/eepro100.c
b/drivers/eepro100.c
index 04c17f69f6e6d94a3b96a1519989a215c9cec1ba..738146e6618e08e05656ca28ab879e38e0ff6fb2 100644
(file)
--- a/
drivers/eepro100.c
+++ b/
drivers/eepro100.c
@@
-30,8
+30,8
@@
#undef DEBUG
#undef DEBUG
-#if
(CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI) &&
\
- defined(CONFIG_EEPRO100)
+#if
defined(CONFIG_CMD_NET)
\
+
&& defined(CONFIG_NET_MULTI) &&
defined(CONFIG_EEPRO100)
/* Ethernet chip registers.
*/
/* Ethernet chip registers.
*/
@@
-272,7
+272,7
@@
static inline void OUTL (struct eth_device *dev, int command, u_long addr)
*(volatile u32 *) ((addr + dev->iobase)) = cpu_to_le32 (command);
}
*(volatile u32 *) ((addr + dev->iobase)) = cpu_to_le32 (command);
}
-#if defined(CONFIG_MII) ||
(CONFIG_COMMANDS & CF
G_CMD_MII)
+#if defined(CONFIG_MII) ||
defined(CONFI
G_CMD_MII)
static inline int INL (struct eth_device *dev, u_long addr)
{
return le32_to_cpu (*(volatile u32 *) (addr + dev->iobase));
static inline int INL (struct eth_device *dev, u_long addr)
{
return le32_to_cpu (*(volatile u32 *) (addr + dev->iobase));
@@
-386,7
+386,7
@@
static int eepro100_miiphy_write (char *devname, unsigned char addr,
return 0;
}
return 0;
}
-#endif
/* defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) */
+#endif
/* Wait for the chip get the command.
*/
/* Wait for the chip get the command.
*/
@@
-462,7
+462,7
@@
int eepro100_initialize (bd_t * bis)
eth_register (dev);
eth_register (dev);
-#if defined (CONFIG_MII) ||
(CONFIG_COMMANDS & CF
G_CMD_MII)
+#if defined (CONFIG_MII) ||
defined(CONFI
G_CMD_MII)
/* register mii command access routines */
miiphy_register(dev->name,
eepro100_miiphy_read, eepro100_miiphy_write);
/* register mii command access routines */
miiphy_register(dev->name,
eepro100_miiphy_read, eepro100_miiphy_write);