Merge branch 'master' of git://git.denx.de/u-boot-arm

[oweals/u-boot.git] / drivers / net / bfin_mac.h

diff --git a/drivers/net/bfin_mac.h b/drivers/net/bfin_mac.h
index 084f53334880c6cd1985a2bdc6f7f335e4c1d319..c731c179b53e7da5cdd70f92505a5ef9a304669b 100644 (file)
--- a/drivers/net/bfin_mac.h
+++ b/drivers/net/bfin_mac.h
@@ -60,7 +60,6 @@ static int bfin_EMAC_init(struct eth_device *dev, bd_t *bd);
 static void bfin_EMAC_halt(struct eth_device *dev);
 static int bfin_EMAC_send(struct eth_device *dev, volatile void *packet, int length);
 static int bfin_EMAC_recv(struct eth_device *dev);
-
-static void bfin_EMAC_setup_addr(bd_t *bd);
+static int bfin_EMAC_setup_addr(struct eth_device *dev);
 
 #endif