diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2002-04-09 15:14:34 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-07-30 17:25:12 -0400 |
commit | ff2ee8cf30199bb625706a43d9cc3bd1ff5ebe42 (patch) | |
tree | c81ffd4887ed7c856596b563e9371ab809383a53 | |
parent | cd030c4cb3ee0cd4f0589a5f723d358cca1f7a9a (diff) |
kobject: put kobject_actions in kobject.h
This prevents the extern declaration in the driver core.
Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/base/core.c | 2 | ||||
-rw-r--r-- | include/linux/kobject.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 3599ab2506d2..b9bb3995db84 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
@@ -24,8 +24,6 @@ | |||
24 | #include "base.h" | 24 | #include "base.h" |
25 | #include "power/power.h" | 25 | #include "power/power.h" |
26 | 26 | ||
27 | extern const char *kobject_actions[]; | ||
28 | |||
29 | int (*platform_notify)(struct device * dev) = NULL; | 27 | int (*platform_notify)(struct device * dev) = NULL; |
30 | int (*platform_notify_remove)(struct device * dev) = NULL; | 28 | int (*platform_notify_remove)(struct device * dev) = NULL; |
31 | 29 | ||
diff --git a/include/linux/kobject.h b/include/linux/kobject.h index aa2fe22b1baa..49a08f84d7c3 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h | |||
@@ -56,6 +56,9 @@ enum kobject_action { | |||
56 | KOBJ_MAX | 56 | KOBJ_MAX |
57 | }; | 57 | }; |
58 | 58 | ||
59 | /* The list of strings defining the valid kobject actions as specified above */ | ||
60 | extern const char *kobject_actions[]; | ||
61 | |||
59 | struct kobject { | 62 | struct kobject { |
60 | const char * k_name; | 63 | const char * k_name; |
61 | char name[KOBJ_NAME_LEN]; | 64 | char name[KOBJ_NAME_LEN]; |