diff --git a/[refs] b/[refs]
index c85edcf43bb3..dbec82df65f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d32bcdd7a90f19bc067a272b353800108d092c5e
+refs/heads/master: f8e4d32cb5153a9d6a8e8864e357dad1349f3b85
diff --git a/trunk/arch/sparc/kernel/ioport.c b/trunk/arch/sparc/kernel/ioport.c
index e6177dde103b..24645f9f56f5 100644
--- a/trunk/arch/sparc/kernel/ioport.c
+++ b/trunk/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) {
diff --git a/trunk/arch/sparc64/kernel/sbus.c b/trunk/arch/sparc64/kernel/sbus.c
index 0193e3823196..0b3e7bc96f61 100644
--- a/trunk/arch/sparc64/kernel/sbus.c
+++ b/trunk/arch/sparc64/kernel/sbus.c
@@ -655,11 +655,6 @@ void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp)
 	sbus_iommu_init(dp->node, sbus);
 }
 
-int __init sbus_arch_preinit(void)
-{
-	return 0;
-}
-
 void __init sbus_arch_postinit(void)
 {
 	extern void firetruck_init(void);
diff --git a/trunk/drivers/sbus/sbus.c b/trunk/drivers/sbus/sbus.c
index 64c3e45875ff..399567b7e15e 100644
--- a/trunk/drivers/sbus/sbus.c
+++ b/trunk/drivers/sbus/sbus.c
@@ -153,9 +153,6 @@ static int __init sbus_init(void)
 	const char *sbus_name = "sbus";
 	int num_sbus = 0;
 
-	if (sbus_arch_preinit())
-		return 0;
-
 	if (sparc_cpu_model == sun4d)
 		sbus_name = "sbi";