summaryrefslogtreecommitdiffstats
path: root/net/eth.c
diff options
context:
space:
mode:
authorBen Warren <biggerbadderben@gmail.com>2008-10-27 23:50:15 -0700
committerBen Warren <biggerbadderben@gmail.com>2008-11-09 21:38:04 -0800
commit96e21f86e8266ed40759e5495ee461265d7f6d28 (patch)
treec832ea73b28de835d1cae2ee6d5123f99bf4607f /net/eth.c
parent9eb79bd8856bcab896ed5e1f1bca159807a124dd (diff)
downloadblackbird-obmc-uboot-96e21f86e8266ed40759e5495ee461265d7f6d28.tar.gz
blackbird-obmc-uboot-96e21f86e8266ed40759e5495ee461265d7f6d28.zip
Changed PPC4xx EMAC driver to require CONFIG_PPC4xx_EMAC
All in-tree IBM/AMCC PPC4xx boards using the EMAC get this new CONFIG Signed-off-by: Ben Warren <biggerbadderben@gmail.com> Acked-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'net/eth.c')
-rw-r--r--net/eth.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/eth.c b/net/eth.c
index 0b954edb78..eab51045a4 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -153,7 +153,7 @@ int eth_initialize(bd_t *bis)
#if defined(CONFIG_DB64460) || defined(CONFIG_P3Mx)
mv6446x_eth_initialize(bis);
#endif
-#if defined(CONFIG_4xx) && !defined(CONFIG_IOP480) && !defined(CONFIG_AP1000)
+#if defined(CONFIG_PPC4xx_EMAC)
ppc_4xx_eth_initialize(bis);
#endif
if (!eth_devices) {
@@ -485,8 +485,7 @@ int eth_initialize(bd_t *bis)
#if defined(CONFIG_AT91RM9200)
at91rm9200_miiphy_initialize(bis);
#endif
-#if defined(CONFIG_4xx) && !defined(CONFIG_IOP480) \
- && !defined(CONFIG_AP1000) && !defined(CONFIG_405)
+#if defined(CONFIG_PPC4xx_EMAC)
emac4xx_miiphy_initialize(bis);
#endif
#if defined(CONFIG_MCF52x2)
OpenPOWER on IntegriCloud