diff options
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/4xx_enet.c | 4 | ||||
| -rw-r--r-- | drivers/net/mcfmii.c | 4 | ||||
| -rw-r--r-- | drivers/net/mpc512x_fec.c | 5 |
3 files changed, 2 insertions, 11 deletions
diff --git a/drivers/net/4xx_enet.c b/drivers/net/4xx_enet.c index 07170f6..9ab5c80 100644 --- a/drivers/net/4xx_enet.c +++ b/drivers/net/4xx_enet.c @@ -97,10 +97,6 @@ #error "CONFIG_MII has to be defined!" #endif -#if defined(CONFIG_NETCONSOLE) && !defined(CONFIG_NET_MULTI) -#error "CONFIG_NET_MULTI has to be defined for NetConsole" -#endif - #define EMAC_RESET_TIMEOUT 1000 /* 1000 ms reset timeout */ #define PHY_AUTONEGOTIATE_TIMEOUT 5000 /* 5000 ms autonegotiate timeout */ diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c index f959c00..471c5ef 100644 --- a/drivers/net/mcfmii.c +++ b/drivers/net/mcfmii.c @@ -35,7 +35,7 @@ DECLARE_GLOBAL_DATA_PTR; -#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) +#if defined(CONFIG_CMD_NET) #undef MII_DEBUG #undef ET_DEBUG @@ -330,4 +330,4 @@ int mcffec_miiphy_write(const char *devname, unsigned char addr, unsigned char r return 0; } -#endif /* CONFIG_CMD_NET, FEC_ENET & NET_MULTI */ +#endif /* CONFIG_CMD_NET */ diff --git a/drivers/net/mpc512x_fec.c b/drivers/net/mpc512x_fec.c index f56d940..0d5efd5 100644 --- a/drivers/net/mpc512x_fec.c +++ b/drivers/net/mpc512x_fec.c @@ -18,9 +18,6 @@ DECLARE_GLOBAL_DATA_PTR; #define DEBUG 0 -#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) && \ - defined(CONFIG_MPC512x_FEC) - #if !(defined(CONFIG_MII) || defined(CONFIG_CMD_MII)) #error "CONFIG_MII has to be defined!" #endif @@ -755,5 +752,3 @@ int fec512x_miiphy_write(const char *devname, u8 phyAddr, u8 regAddr, u16 data) return 0; } - -#endif /* CONFIG_MPC512x_FEC */ |