diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2011-02-06 21:57:18 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-18 08:02:10 -0800 |
| commit | b38360a284f8acab4ae431b387c05a4e19ff4129 (patch) | |
| tree | 0fb1012364ba465e1f994f9a35b3a9e94f4f692b | |
| parent | 781a7395d239dbdb59738ca7fe08e71641bf583c (diff) | |
| download | blackbird-op-linux-b38360a284f8acab4ae431b387c05a4e19ff4129.tar.gz blackbird-op-linux-b38360a284f8acab4ae431b387c05a4e19ff4129.zip | |
kobject.h: fix build when CONFIG_HOTPLUG is disabled
When CONFIG_HOTPLUG is not enabled, the inline function add_uevent_var()
needs to have its __attribute__ before the function name/parameters,
otherwise there are syntax errors.
linux-next-20110207/include/linux/kobject.h:232: error: expected ',' or ';' before '{' token
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | include/linux/kobject.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/kobject.h b/include/linux/kobject.h index 15e82c132f78..9229b64ee3aa 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h @@ -226,9 +226,8 @@ static inline int kobject_uevent_env(struct kobject *kobj, char *envp[]) { return 0; } -static inline int add_uevent_var(struct kobj_uevent_env *env, - const char *format, ...) - __attribute__((format(printf, 2, 3))) +static inline __attribute__((format(printf, 2, 3))) +int add_uevent_var(struct kobj_uevent_env *env, const char *format, ...) { return 0; } static inline int kobject_action_type(const char *buf, size_t count, |
