summaryrefslogtreecommitdiff
path: root/arch/sparc/kernel
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-08-27 04:20:14 -0700
committerDavid S. Miller <davem@davemloft.net>2008-08-29 02:15:19 -0700
commitf8e4d32cb5153a9d6a8e8864e357dad1349f3b85 (patch)
treecaa92e6dfa504a528f47de9fbb736fcdeac70129 /arch/sparc/kernel
parentd32bcdd7a90f19bc067a272b353800108d092c5e (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')
-rw-r--r--arch/sparc/kernel/ioport.c12
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)
#endif
}
-int __init sbus_arch_preinit(void)
+static int __init sparc_register_ioport(void)
{
register_proc_sparc_ioport();
-#ifdef CONFIG_SUN4
- {
- extern void sun4_dvma_init(void);
- sun4_dvma_init();
- }
- return 1;
-#else
return 0;
-#endif
}
+arch_initcall(sparc_register_ioport);
+
void __init sbus_arch_postinit(void)
{
if (sparc_cpu_model == sun4d) {