Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[linux-2.6] / drivers / base / base.h

diff --git a/drivers/base/base.h b/drivers/base/base.h
index 5735b38582d0381872e9fda2198f2bc10147b913..10b2fb6c9ce68fdbae4a9a4822a298ead5c3732b 100644 (file)
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -5,12 +5,18 @@ extern int devices_init(void);
 extern int buses_init(void);
 extern int classes_init(void);
 extern int firmware_init(void);
+#ifdef CONFIG_SYS_HYPERVISOR
+extern int hypervisor_init(void);
+#else
+static inline int hypervisor_init(void) { return 0; }
+#endif
 extern int platform_bus_init(void);
 extern int system_bus_init(void);
 extern int cpu_dev_init(void);
 extern int attribute_container_init(void);
 
 extern int bus_add_device(struct device * dev);
+extern void bus_attach_device(struct device * dev);
 extern void bus_remove_device(struct device * dev);
 
 extern int bus_add_driver(struct device_driver *);
@@ -34,4 +40,8 @@ struct class_device_attribute *to_class_dev_attr(struct attribute *_attr)
        return container_of(_attr, struct class_device_attribute, attr);
 }
 
+extern char *make_class_name(const char *name, struct kobject *kobj);
 
+extern int devres_release_all(struct device *dev);
+
+extern struct kset devices_subsys;