summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-10-27 11:03:00 -0400
committerTom Rini <trini@ti.com>2014-10-27 11:03:00 -0400
commit0cf876154922118d8fb1b4c30f527c95a113bef3 (patch)
tree83eb6a7966a1949526e1e6066470952162f51c1d /drivers/net
parent0ce4af99c07acebf4fce9a91f1099d2460629293 (diff)
parentf06f9a1fb1cd332435b9e8660355f57d7d3f98d8 (diff)
downloadu-boot-imx-0cf876154922118d8fb1b4c30f527c95a113bef3.zip
u-boot-imx-0cf876154922118d8fb1b4c30f527c95a113bef3.tar.gz
u-boot-imx-0cf876154922118d8fb1b4c30f527c95a113bef3.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mpc5xxx
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/eepro100.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index 1e4ea0c..a23a585 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -230,7 +230,7 @@ static int eepro100_send(struct eth_device *dev, void *packet, int length);
static int eepro100_recv (struct eth_device *dev);
static void eepro100_halt (struct eth_device *dev);
-#if defined(CONFIG_E500) || defined(CONFIG_DB64360) || defined(CONFIG_DB64460)
+#if defined(CONFIG_E500)
#define bus_to_phys(a) (a)
#define phys_to_bus(a) (a)
#else