aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2009-11-03 08:42:02 -0500
committerGeert Uytterhoeven <geert@linux-m68k.org>2010-02-27 12:31:11 -0500
commiteeb9c182a6ad8bc130377adb0a4cd7b95dd15f49 (patch)
treecf891a3d1dadbb867966aa3b7b1a5be58ac4155b /arch/m68k
parentcff75f1fb1f28eba3facb7dbe9b40a892912578a (diff)
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 = {
921 .id = 1, 921 .id = 1,
922}; 922};
923 923
924static struct platform_device sonic_pdev = {
925 .name = "macsonic",
926 .id = -1,
927};
928
929static struct platform_device mace_pdev = {
930 .name = "macmace",
931 .id = -1,
932};
933
924int __init mac_platform_init(void) 934int __init mac_platform_init(void)
925{ 935{
926 u8 *swim_base; 936 u8 *swim_base;
@@ -971,6 +981,19 @@ int __init mac_platform_init(void)
971 break; 981 break;
972 } 982 }
973 983
984 /*
985 * Ethernet device
986 */
987
988 switch (macintosh_config->ether_type) {
989 case MAC_ETHER_SONIC:
990 platform_device_register(&sonic_pdev);
991 break;
992 case MAC_ETHER_MACE:
993 platform_device_register(&mace_pdev);
994 break;
995 }
996
974 return 0; 997 return 0;
975} 998}
976 999