summaryrefslogtreecommitdiffstats
path: root/arch/blackfin/mach-bf537/boards/tcm_bf537.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-06 14:42:54 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-06 14:42:54 +0100
commit0464ac9ebd90cfd5792d3c1158af848281b7eb09 (patch)
treeab4419845b9e7ae3417741f34cfab6acd00754aa /arch/blackfin/mach-bf537/boards/tcm_bf537.c
parent0973a06cde8cc1522fbcf2baacb926f1ee3f4c79 (diff)
parent9be260a646bf76fa418ee519afa10196b3164681 (diff)
downloadblackbird-op-linux-0464ac9ebd90cfd5792d3c1158af848281b7eb09.tar.gz
blackbird-op-linux-0464ac9ebd90cfd5792d3c1158af848281b7eb09.zip
Merge branch 'linus' into x86/mm
Conflicts: arch/x86/mm/fault.c
Diffstat (limited to 'arch/blackfin/mach-bf537/boards/tcm_bf537.c')
-rw-r--r--arch/blackfin/mach-bf537/boards/tcm_bf537.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
index 2f4b066153c5..3f4f203a06ec 100644
--- a/arch/blackfin/mach-bf537/boards/tcm_bf537.c
+++ b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
@@ -481,8 +481,13 @@ static struct platform_device bfin_sport1_uart_device = {
#endif
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+static struct platform_device bfin_mii_bus = {
+ .name = "bfin_mii_bus",
+};
+
static struct platform_device bfin_mac_device = {
.name = "bfin_mac",
+ .dev.platform_data = &bfin_mii_bus,
};
#endif
@@ -593,6 +598,7 @@ static struct platform_device *cm_bf537_devices[] __initdata = {
#endif
#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+ &bfin_mii_bus,
&bfin_mac_device,
#endif
@@ -615,7 +621,7 @@ static struct platform_device *cm_bf537_devices[] __initdata = {
&bfin_gpios_device,
};
-static int __init cm_bf537_init(void)
+static int __init tcm_bf537_init(void)
{
printk(KERN_INFO "%s(): registering device resources\n", __func__);
platform_add_devices(cm_bf537_devices, ARRAY_SIZE(cm_bf537_devices));
@@ -629,7 +635,7 @@ static int __init cm_bf537_init(void)
return 0;
}
-arch_initcall(cm_bf537_init);
+arch_initcall(tcm_bf537_init);
void bfin_get_ether_addr(char *addr)
{
OpenPOWER on IntegriCloud