aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2009-11-04 00:42:02 +1100
committerGeert Uytterhoeven <geert@linux-m68k.org>2010-02-27 18:31:11 +0100
commiteeb9c182a6ad8bc130377adb0a4cd7b95dd15f49 (patch)
treecf891a3d1dadbb867966aa3b7b1a5be58ac4155b /arch/m68k
parentmac68k: move mac_esp platform device (diff)
downloadlinux-dev-eeb9c182a6ad8bc130377adb0a4cd7b95dd15f49.tar.xz
linux-dev-eeb9c182a6ad8bc130377adb0a4cd7b95dd15f49.zip
mac68k: move macsonic and macmace platform devices
Move platform device code from the drivers to the platform init function. Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/mac/config.c23
1 files changed, 23 insertions, 0 deletions
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index 91245ade2290..816452b3e50f 100644
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -921,6 +921,16 @@ static struct platform_device esp_1_pdev = {
.id = 1,
};
+static struct platform_device sonic_pdev = {
+ .name = "macsonic",
+ .id = -1,
+};
+
+static struct platform_device mace_pdev = {
+ .name = "macmace",
+ .id = -1,
+};
+
int __init mac_platform_init(void)
{
u8 *swim_base;
@@ -971,6 +981,19 @@ int __init mac_platform_init(void)
break;
}
+ /*
+ * Ethernet device
+ */
+
+ switch (macintosh_config->ether_type) {
+ case MAC_ETHER_SONIC:
+ platform_device_register(&sonic_pdev);
+ break;
+ case MAC_ETHER_MACE:
+ platform_device_register(&mace_pdev);
+ break;
+ }
+
return 0;
}