Merge branch 'linus' into x86/ptemask

[linux-2.6-omap-h63xx.git] / include / asm-sparc64 / of_platform.h

diff --git a/include/asm-sparc64/of_platform.h b/include/asm-sparc64/of_platform.h
index f7c1f17c7d52bb4ced8ee5a347105cb037a502cd..78aa032b674c42bb7a4e1f02aaa6d243d298d13f 100644 (file)
--- a/include/asm-sparc64/of_platform.h
+++ b/include/asm-sparc64/of_platform.h
@@ -19,15 +19,7 @@
 extern struct bus_type isa_bus_type;
 extern struct bus_type ebus_bus_type;
 extern struct bus_type sbus_bus_type;
-extern struct bus_type of_platform_bus_type;
-#define of_bus_type    of_platform_bus_type    /* for compatibility */
 
-extern int of_register_driver(struct of_platform_driver *drv,
-                             struct bus_type *bus);
-extern void of_unregister_driver(struct of_platform_driver *drv);
-extern struct of_device *of_platform_device_create(struct device_node *np,
-                                                  const char *bus_id,
-                                                  struct device *parent,
-                                                  struct bus_type *bus);
+#define of_bus_type    of_platform_bus_type    /* for compatibility */
 
 #endif /* _ASM_SPARC64_OF_PLATFORM_H */