diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2002-04-09 21:14:34 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-07-30 23:25:12 +0200 |
| commit | ff2ee8cf30199bb625706a43d9cc3bd1ff5ebe42 (patch) | |
| tree | c81ffd4887ed7c856596b563e9371ab809383a53 | |
| parent | kobject: fix link error when CONFIG_HOTPLUG is disabled (diff) | |
| download | linux-ff2ee8cf30199bb625706a43d9cc3bd1ff5ebe42.tar.xz linux-ff2ee8cf30199bb625706a43d9cc3bd1ff5ebe42.zip | |
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 @@ #include "base.h" #include "power/power.h" -extern const char *kobject_actions[]; - int (*platform_notify)(struct device * dev) = NULL; int (*platform_notify_remove)(struct device * dev) = NULL; 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 { KOBJ_MAX }; +/* The list of strings defining the valid kobject actions as specified above */ +extern const char *kobject_actions[]; + struct kobject { const char * k_name; char name[KOBJ_NAME_LEN]; |