[PATCH] Sun-3 SBUS updates

Sun-3 SBUS updates (from Sam Creasey):
  - Rename struct linux_sbus_device to struct sbus_dev for source code
    compatibility with SPARC
  - Make sbus_init() an initcall

arch/m68k/sun3/sbus.c

@@ -14,11 +14,12 @@
 
 extern void rs_init(void);
 
-void __init sbus_init(void)
+int __init sbus_init(void)
 {
 
 	rs_init();
 
+	return 0;
 }
 
 void *sparc_alloc_io (u32 address, void *virtual, int len, char *name,
@@ -27,3 +28,4 @@ void *sparc_alloc_io (u32 address, void *virtual, int len, char *name,
 	return (void *)address;
 }
 
+subsys_initcall(sbus_init);

include/asm-m68k/sbus.h

@@ -5,7 +5,7 @@
 #ifndef __M68K_SBUS_H
 #define __M68K_SBUS_H
 
-struct linux_sbus_device {
+struct sbus_dev {
 	struct {
 		unsigned int which_io;
 		unsigned int phys_addr;