git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ../linux-2.6-watchdog-mm
[pandora-kernel.git]
/
include
/
linux
/
kobject.h
diff --git
a/include/linux/kobject.h
b/include/linux/kobject.h
index
d1c8d28
..
76538fc
100644
(file)
--- a/
include/linux/kobject.h
+++ b/
include/linux/kobject.h
@@
-265,8
+265,8
@@
extern int __must_check subsys_create_file(struct subsystem * ,
struct subsys_attribute *);
#if defined(CONFIG_HOTPLUG)
struct subsys_attribute *);
#if defined(CONFIG_HOTPLUG)
-
void
kobject_uevent(struct kobject *kobj, enum kobject_action action);
-
void
kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
+
int
kobject_uevent(struct kobject *kobj, enum kobject_action action);
+
int
kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
char *envp[]);
int add_uevent_var(char **envp, int num_envp, int *cur_index,
char *envp[]);
int add_uevent_var(char **envp, int num_envp, int *cur_index,
@@
-274,11
+274,12
@@
int add_uevent_var(char **envp, int num_envp, int *cur_index,
const char *format, ...)
__attribute__((format (printf, 7, 8)));
#else
const char *format, ...)
__attribute__((format (printf, 7, 8)));
#else
-static inline void kobject_uevent(struct kobject *kobj, enum kobject_action action) { }
-static inline void kobject_uevent_env(struct kobject *kobj,
+static inline int kobject_uevent(struct kobject *kobj, enum kobject_action action)
+{ return 0; }
+static inline int kobject_uevent_env(struct kobject *kobj,
enum kobject_action action,
char *envp[])
enum kobject_action action,
char *envp[])
-{ }
+{
return 0;
}
static inline int add_uevent_var(char **envp, int num_envp, int *cur_index,
char *buffer, int buffer_size, int *cur_len,
static inline int add_uevent_var(char **envp, int num_envp, int *cur_index,
char *buffer, int buffer_size, int *cur_len,