diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2008-01-28 11:55:42 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-01-28 14:15:26 -0500 |
commit | 77b41597e8d469535cfe09a641654bdc97dcf0d0 (patch) | |
tree | 6869ddf46053eb1a1d2413a5b074f2e7d78c0641 /arch | |
parent | b38308ac8e0404eea82fec09d560a2bc29a514f4 (diff) |
[POWERPC] 85xx: convert sbc85* boards to use machine_device_initcall
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/platforms/85xx/sbc8548.c | 6 | ||||
-rw-r--r-- | arch/powerpc/platforms/85xx/sbc8560.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/arch/powerpc/platforms/85xx/sbc8548.c b/arch/powerpc/platforms/85xx/sbc8548.c index de27b576c13d..488facb99fe8 100644 --- a/arch/powerpc/platforms/85xx/sbc8548.c +++ b/arch/powerpc/platforms/85xx/sbc8548.c | |||
@@ -135,13 +135,11 @@ static struct of_device_id __initdata of_bus_ids[] = { | |||
135 | 135 | ||
136 | static int __init declare_of_platform_devices(void) | 136 | static int __init declare_of_platform_devices(void) |
137 | { | 137 | { |
138 | if (!machine_is(sbc8548)) | ||
139 | return 0; | ||
140 | |||
141 | of_platform_bus_probe(NULL, of_bus_ids, NULL); | 138 | of_platform_bus_probe(NULL, of_bus_ids, NULL); |
139 | |||
142 | return 0; | 140 | return 0; |
143 | } | 141 | } |
144 | device_initcall(declare_of_platform_devices); | 142 | machine_device_initcall(sbc8548, declare_of_platform_devices); |
145 | 143 | ||
146 | /* | 144 | /* |
147 | * Called very early, device-tree isn't unflattened | 145 | * Called very early, device-tree isn't unflattened |
diff --git a/arch/powerpc/platforms/85xx/sbc8560.c b/arch/powerpc/platforms/85xx/sbc8560.c index e2bc368b38d9..2c580cd24e4f 100644 --- a/arch/powerpc/platforms/85xx/sbc8560.c +++ b/arch/powerpc/platforms/85xx/sbc8560.c | |||
@@ -222,13 +222,11 @@ static struct of_device_id __initdata of_bus_ids[] = { | |||
222 | 222 | ||
223 | static int __init declare_of_platform_devices(void) | 223 | static int __init declare_of_platform_devices(void) |
224 | { | 224 | { |
225 | if (!machine_is(sbc8560)) | ||
226 | return 0; | ||
227 | |||
228 | of_platform_bus_probe(NULL, of_bus_ids, NULL); | 225 | of_platform_bus_probe(NULL, of_bus_ids, NULL); |
226 | |||
229 | return 0; | 227 | return 0; |
230 | } | 228 | } |
231 | device_initcall(declare_of_platform_devices); | 229 | machine_device_initcall(sbc8560, declare_of_platform_devices); |
232 | 230 | ||
233 | /* | 231 | /* |
234 | * Called very early, device-tree isn't unflattened | 232 | * Called very early, device-tree isn't unflattened |