diff options
author | David S. Miller <davem@davemloft.net> | 2008-08-27 07:20:14 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-08-29 05:15:19 -0400 |
commit | f8e4d32cb5153a9d6a8e8864e357dad1349f3b85 (patch) | |
tree | caa92e6dfa504a528f47de9fbb736fcdeac70129 /arch/sparc/kernel/ioport.c | |
parent | d32bcdd7a90f19bc067a272b353800108d092c5e (diff) |
sparc: Kill sbus_arch_preinit().
32-bit sparc just needed it to register the ioport procfs bits, do this
via an arch_initcall() instead.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/ioport.c')
-rw-r--r-- | arch/sparc/kernel/ioport.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c index e6177dde103b..24645f9f56f5 100644 --- a/arch/sparc/kernel/ioport.c +++ b/arch/sparc/kernel/ioport.c | |||
@@ -393,21 +393,15 @@ void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp) | |||
393 | #endif | 393 | #endif |
394 | } | 394 | } |
395 | 395 | ||
396 | int __init sbus_arch_preinit(void) | 396 | static int __init sparc_register_ioport(void) |
397 | { | 397 | { |
398 | register_proc_sparc_ioport(); | 398 | register_proc_sparc_ioport(); |
399 | 399 | ||
400 | #ifdef CONFIG_SUN4 | ||
401 | { | ||
402 | extern void sun4_dvma_init(void); | ||
403 | sun4_dvma_init(); | ||
404 | } | ||
405 | return 1; | ||
406 | #else | ||
407 | return 0; | 400 | return 0; |
408 | #endif | ||
409 | } | 401 | } |
410 | 402 | ||
403 | arch_initcall(sparc_register_ioport); | ||
404 | |||
411 | void __init sbus_arch_postinit(void) | 405 | void __init sbus_arch_postinit(void) |
412 | { | 406 | { |
413 | if (sparc_cpu_model == sun4d) { | 407 | if (sparc_cpu_model == sun4d) { |