diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-03-10 02:41:57 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-03-10 02:41:57 -0500 |
commit | d28c145debb1bd53cde63ac8bccc192e3e00067e (patch) | |
tree | 87fb1d66cab7689aa662ebd0337b39ff1bf6f433 /lib/kobject_uevent.c | |
parent | 2e733b3f84fa9c2ae60513c5f7b56d599ed2ae02 (diff) | |
parent | ec0ffe2ee0e0fb9da4409d86bfd72636450f32df (diff) |
Merge branch 'sh/driver-core' into sh/clkfwk
Diffstat (limited to 'lib/kobject_uevent.c')
-rw-r--r-- | lib/kobject_uevent.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c index 920a3ca6e259..c9d3a3e8405d 100644 --- a/lib/kobject_uevent.c +++ b/lib/kobject_uevent.c | |||
@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action, | |||
95 | const char *subsystem; | 95 | const char *subsystem; |
96 | struct kobject *top_kobj; | 96 | struct kobject *top_kobj; |
97 | struct kset *kset; | 97 | struct kset *kset; |
98 | struct kset_uevent_ops *uevent_ops; | 98 | const struct kset_uevent_ops *uevent_ops; |
99 | u64 seq; | 99 | u64 seq; |
100 | int i = 0; | 100 | int i = 0; |
101 | int retval = 0; | 101 | int retval = 0; |