This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / linux / kobject.h

diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index 187ac79..331d25b 100644 (file)
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -22,14 +22,10 @@
 #include <linux/sysfs.h>
 #include <linux/rwsem.h>
 #include <linux/kref.h>
-#include <linux/kobject_uevent.h>
 #include <asm/atomic.h>
 
 #define KOBJ_NAME_LEN  20
 
-/* counter to tag the hotplug event, read only except for the kobject core */
-extern u64 hotplug_seqnum;
-
 struct kobject {
        char                    * k_name;
        char                    name[KOBJ_NAME_LEN];
@@ -63,7 +59,9 @@ extern void kobject_unregister(struct kobject *);
 extern struct kobject * kobject_get(struct kobject *);
 extern void kobject_put(struct kobject *);
 
-extern char * kobject_get_path(struct kobject *, int);
+extern void kobject_hotplug(const char *action, struct kobject *);
+
+extern char * kobject_get_path(struct kset *, struct kobject *, int);
 
 struct kobj_type {
        void (*release)(struct kobject *);
@@ -236,19 +234,5 @@ struct subsys_attribute {
 extern int subsys_create_file(struct subsystem * , struct subsys_attribute *);
 extern void subsys_remove_file(struct subsystem * , struct subsys_attribute *);
 
-#ifdef CONFIG_HOTPLUG
-void kobject_hotplug(struct kobject *kobj, enum kobject_action action);
-int add_hotplug_env_var(char **envp, int num_envp, int *cur_index,
-                       char *buffer, int buffer_size, int *cur_len,
-                       const char *format, ...)
-       __attribute__((format (printf, 7, 8)));
-#else
-static inline void kobject_hotplug(struct kobject *kobj, enum kobject_action action) { }
-static inline int add_hotplug_env_var(char **envp, int num_envp, int *cur_index, 
-                                     char *buffer, int buffer_size, int *cur_len, 
-                                     const char *format, ...)
-{ return 0; }
-#endif
-
 #endif /* __KERNEL__ */
 #endif /* _KOBJECT_H_ */