aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/blackfin/mach-bf527/boards/ezkit.c4
-rw-r--r--arch/blackfin/mach-bf537/boards/cm_bf537.c4
-rw-r--r--arch/blackfin/mach-bf537/boards/generic_board.c4
-rw-r--r--arch/blackfin/mach-bf537/boards/pnav10.c4
-rw-r--r--arch/blackfin/mach-bf537/boards/stamp.c4
-rw-r--r--drivers/net/bfin_mac.c2
-rw-r--r--drivers/net/bfin_mac.h2
7 files changed, 12 insertions, 12 deletions
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c
index 57407b95d532..14b39b23833b 100644
--- a/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -813,9 +813,9 @@ void native_machine_restart(char *cmd)
813 * Currently the MAC address is saved in Flash by U-Boot 813 * Currently the MAC address is saved in Flash by U-Boot
814 */ 814 */
815#define FLASH_MAC 0x203f0000 815#define FLASH_MAC 0x203f0000
816void get_bf537_ether_addr(char *addr) 816void bfin_get_ether_addr(char *addr)
817{ 817{
818 *(u32 *)(&(addr[0])) = bfin_read32(FLASH_MAC); 818 *(u32 *)(&(addr[0])) = bfin_read32(FLASH_MAC);
819 *(u16 *)(&(addr[4])) = bfin_read16(FLASH_MAC + 4); 819 *(u16 *)(&(addr[4])) = bfin_read16(FLASH_MAC + 4);
820} 820}
821EXPORT_SYMBOL(get_bf537_ether_addr); 821EXPORT_SYMBOL(bfin_get_ether_addr);
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537.c b/arch/blackfin/mach-bf537/boards/cm_bf537.c
index 97482d9b4177..1c227a231464 100644
--- a/arch/blackfin/mach-bf537/boards/cm_bf537.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537.c
@@ -428,9 +428,9 @@ static int __init cm_bf537_init(void)
428 428
429arch_initcall(cm_bf537_init); 429arch_initcall(cm_bf537_init);
430 430
431void get_bf537_ether_addr(char *addr) 431void bfin_get_ether_addr(char *addr)
432{ 432{
433 random_ether_addr(addr); 433 random_ether_addr(addr);
434 printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__); 434 printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
435} 435}
436EXPORT_SYMBOL(get_bf537_ether_addr); 436EXPORT_SYMBOL(bfin_get_ether_addr);
diff --git a/arch/blackfin/mach-bf537/boards/generic_board.c b/arch/blackfin/mach-bf537/boards/generic_board.c
index d9e48ba23de1..ec19a871da81 100644
--- a/arch/blackfin/mach-bf537/boards/generic_board.c
+++ b/arch/blackfin/mach-bf537/boards/generic_board.c
@@ -733,9 +733,9 @@ void native_machine_restart(char *cmd)
733 bfin_gpio_reset_spi0_ssel1(); 733 bfin_gpio_reset_spi0_ssel1();
734} 734}
735 735
736void get_bf537_ether_addr(char *addr) 736void bfin_get_ether_addr(char *addr)
737{ 737{
738 random_ether_addr(addr); 738 random_ether_addr(addr);
739 printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__); 739 printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
740} 740}
741EXPORT_SYMBOL(get_bf537_ether_addr); 741EXPORT_SYMBOL(bfin_get_ether_addr);
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c
index eea2afc72b57..624330cc7a6d 100644
--- a/arch/blackfin/mach-bf537/boards/pnav10.c
+++ b/arch/blackfin/mach-bf537/boards/pnav10.c
@@ -511,9 +511,9 @@ static int __init stamp_init(void)
511 511
512arch_initcall(stamp_init); 512arch_initcall(stamp_init);
513 513
514void get_bf537_ether_addr(char *addr) 514void bfin_get_ether_addr(char *addr)
515{ 515{
516 random_ether_addr(addr); 516 random_ether_addr(addr);
517 printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__); 517 printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
518} 518}
519EXPORT_SYMBOL(get_bf537_ether_addr); 519EXPORT_SYMBOL(bfin_get_ether_addr);
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index d35f9628972c..90de2182c8d6 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -737,9 +737,9 @@ void native_machine_restart(char *cmd)
737 * Currently the MAC address is saved in Flash by U-Boot 737 * Currently the MAC address is saved in Flash by U-Boot
738 */ 738 */
739#define FLASH_MAC 0x203f0000 739#define FLASH_MAC 0x203f0000
740void get_bf537_ether_addr(char *addr) 740void bfin_get_ether_addr(char *addr)
741{ 741{
742 *(u32 *)(&(addr[0])) = bfin_read32(FLASH_MAC); 742 *(u32 *)(&(addr[0])) = bfin_read32(FLASH_MAC);
743 *(u16 *)(&(addr[4])) = bfin_read16(FLASH_MAC + 4); 743 *(u16 *)(&(addr[4])) = bfin_read16(FLASH_MAC + 4);
744} 744}
745EXPORT_SYMBOL(get_bf537_ether_addr); 745EXPORT_SYMBOL(bfin_get_ether_addr);
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index 084acfd6fc5f..0b99b5549295 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -924,7 +924,7 @@ static int __init bf537mac_probe(struct net_device *dev)
924 if (!is_valid_ether_addr(dev->dev_addr)) { 924 if (!is_valid_ether_addr(dev->dev_addr)) {
925 /* Grab the MAC from the board somehow - this is done in the 925 /* Grab the MAC from the board somehow - this is done in the
926 arch/blackfin/mach-bf537/boards/eth_mac.c */ 926 arch/blackfin/mach-bf537/boards/eth_mac.c */
927 get_bf537_ether_addr(dev->dev_addr); 927 bfin_get_ether_addr(dev->dev_addr);
928 } 928 }
929 929
930 /* If still not valid, get a random one */ 930 /* If still not valid, get a random one */
diff --git a/drivers/net/bfin_mac.h b/drivers/net/bfin_mac.h
index 3a107ad75381..5970ea7142cd 100644
--- a/drivers/net/bfin_mac.h
+++ b/drivers/net/bfin_mac.h
@@ -92,4 +92,4 @@ struct bf537mac_local {
92 struct mii_bus mii_bus; 92 struct mii_bus mii_bus;
93}; 93};
94 94
95extern void get_bf537_ether_addr(char *addr); 95extern void bfin_get_ether_addr(char *addr);