diff options
| author | Jon Loeliger <jdl@freescale.com> | 2008-02-14 14:07:21 -0600 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2008-02-14 14:07:21 -0600 |
| commit | 746c4b9490495dc4381dbcc49f40078d423e0a48 (patch) | |
| tree | e726020abb9e37df1fca19d8895bf203b27612d1 /board | |
| parent | 3f2ac8f928c76cbd2374437b2d079f8b4324aaba (diff) | |
| parent | fe891ecf4d187e9d11dde869ed4623af52b54451 (diff) | |
Merge commit 'wd/master'
Diffstat (limited to 'board')
| -rw-r--r-- | board/BuS/EB+MCF-EV123/mii.c | 2 | ||||
| -rw-r--r-- | board/cobra5272/mii.c | 2 | ||||
| -rw-r--r-- | board/idmr/mii.c | 2 | ||||
| -rw-r--r-- | board/m5271evb/mii.c | 2 | ||||
| -rw-r--r-- | board/m5272c3/mii.c | 2 | ||||
| -rw-r--r-- | board/m5282evb/mii.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/board/BuS/EB+MCF-EV123/mii.c b/board/BuS/EB+MCF-EV123/mii.c index ebd3ed9387..3ea20a6109 100644 --- a/board/BuS/EB+MCF-EV123/mii.c +++ b/board/BuS/EB+MCF-EV123/mii.c @@ -132,7 +132,7 @@ uint mii_send(uint mii_cmd) return (mii_reply & 0xffff); /* data read from phy */ } -#endif /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CONFIG_CMD_MII) */ +#endif /* CFG_DISCOVER_PHY || CONFIG_CMD_MII */ #if defined(CFG_DISCOVER_PHY) int mii_discover_phy(struct eth_device *dev) diff --git a/board/cobra5272/mii.c b/board/cobra5272/mii.c index fadcbb3ef8..d0a4a39f99 100644 --- a/board/cobra5272/mii.c +++ b/board/cobra5272/mii.c @@ -131,7 +131,7 @@ uint mii_send(uint mii_cmd) return (mii_reply & 0xffff); /* data read from phy */ } -#endif /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CONFIG_CMD_MII) */ +#endif /* CFG_DISCOVER_PHY || CONFIG_CMD_MII */ #if defined(CFG_DISCOVER_PHY) int mii_discover_phy(struct eth_device *dev) diff --git a/board/idmr/mii.c b/board/idmr/mii.c index f6c63c302b..f130e6e536 100644 --- a/board/idmr/mii.c +++ b/board/idmr/mii.c @@ -131,7 +131,7 @@ uint mii_send(uint mii_cmd) return (mii_reply & 0xffff); /* data read from phy */ } -#endif /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CONFIG_CMD_MII) */ +#endif /* CFG_DISCOVER_PHY || CONFIG_CMD_MII */ #if defined(CFG_DISCOVER_PHY) int mii_discover_phy(struct eth_device *dev) diff --git a/board/m5271evb/mii.c b/board/m5271evb/mii.c index 3830ce7f28..78a7028bcf 100644 --- a/board/m5271evb/mii.c +++ b/board/m5271evb/mii.c @@ -131,7 +131,7 @@ uint mii_send(uint mii_cmd) return (mii_reply & 0xffff); /* data read from phy */ } -#endif /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CONFIG_CMD_MII) */ +#endif /* CFG_DISCOVER_PHY || CONFIG_CMD_MII */ #if defined(CFG_DISCOVER_PHY) int mii_discover_phy(struct eth_device *dev) diff --git a/board/m5272c3/mii.c b/board/m5272c3/mii.c index 0ecc44ace2..b30ba803f9 100644 --- a/board/m5272c3/mii.c +++ b/board/m5272c3/mii.c @@ -131,7 +131,7 @@ uint mii_send(uint mii_cmd) return (mii_reply & 0xffff); /* data read from phy */ } -#endif /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CONFIG_CMD_MII) */ +#endif /* CFG_DISCOVER_PHY || CONFIG_CMD_MII */ #if defined(CFG_DISCOVER_PHY) int mii_discover_phy(struct eth_device *dev) diff --git a/board/m5282evb/mii.c b/board/m5282evb/mii.c index d7c6d1f0e3..8ae2ec69ce 100644 --- a/board/m5282evb/mii.c +++ b/board/m5282evb/mii.c @@ -132,7 +132,7 @@ uint mii_send(uint mii_cmd) return (mii_reply & 0xffff); /* data read from phy */ } -#endif /* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CONFIG_CMD_MII) */ +#endif /* CFG_DISCOVER_PHY || CONFIG_CMD_MII */ #if defined(CFG_DISCOVER_PHY) int mii_discover_phy(struct eth_device *dev) |