diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:19:30 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-28 13:33:03 -0500 |
commit | e3a1a5ec5cd516c85848611992102fc00e8af601 (patch) | |
tree | 18fca24cc9c11d1bebd97311d1253b0356e17863 /kernel/ksysfs.c | |
parent | 3b572b506c76a7a38c8debe45b50d09295620810 (diff) |
kernel/ksysfs.c: remove CONFIG_HOTPLUG ifdefs
Remove conditional code based on CONFIG_HOTPLUG being false. It's
always on now in preparation of it going away as an option.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/ksysfs.c')
-rw-r--r-- | kernel/ksysfs.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c index 4e316e1acf58..c01eac66c0cc 100644 --- a/kernel/ksysfs.c +++ b/kernel/ksysfs.c | |||
@@ -26,7 +26,6 @@ static struct kobj_attribute _name##_attr = __ATTR_RO(_name) | |||
26 | static struct kobj_attribute _name##_attr = \ | 26 | static struct kobj_attribute _name##_attr = \ |
27 | __ATTR(_name, 0644, _name##_show, _name##_store) | 27 | __ATTR(_name, 0644, _name##_show, _name##_store) |
28 | 28 | ||
29 | #if defined(CONFIG_HOTPLUG) | ||
30 | /* current uevent sequence number */ | 29 | /* current uevent sequence number */ |
31 | static ssize_t uevent_seqnum_show(struct kobject *kobj, | 30 | static ssize_t uevent_seqnum_show(struct kobject *kobj, |
32 | struct kobj_attribute *attr, char *buf) | 31 | struct kobj_attribute *attr, char *buf) |
@@ -54,7 +53,7 @@ static ssize_t uevent_helper_store(struct kobject *kobj, | |||
54 | return count; | 53 | return count; |
55 | } | 54 | } |
56 | KERNEL_ATTR_RW(uevent_helper); | 55 | KERNEL_ATTR_RW(uevent_helper); |
57 | #endif | 56 | |
58 | 57 | ||
59 | #ifdef CONFIG_PROFILING | 58 | #ifdef CONFIG_PROFILING |
60 | static ssize_t profiling_show(struct kobject *kobj, | 59 | static ssize_t profiling_show(struct kobject *kobj, |
@@ -169,10 +168,8 @@ EXPORT_SYMBOL_GPL(kernel_kobj); | |||
169 | 168 | ||
170 | static struct attribute * kernel_attrs[] = { | 169 | static struct attribute * kernel_attrs[] = { |
171 | &fscaps_attr.attr, | 170 | &fscaps_attr.attr, |
172 | #if defined(CONFIG_HOTPLUG) | ||
173 | &uevent_seqnum_attr.attr, | 171 | &uevent_seqnum_attr.attr, |
174 | &uevent_helper_attr.attr, | 172 | &uevent_helper_attr.attr, |
175 | #endif | ||
176 | #ifdef CONFIG_PROFILING | 173 | #ifdef CONFIG_PROFILING |
177 | &profiling_attr.attr, | 174 | &profiling_attr.attr, |
178 | #endif | 175 | #endif |