diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:19:29 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-28 13:33:03 -0500 |
commit | 3b572b506c76a7a38c8debe45b50d09295620810 (patch) | |
tree | f1a6e47c3eadc04f44f3ba086712ad853cea992a /kernel/sysctl.c | |
parent | 1c9a9f59149e247e264db1fbf9f8ea3d5066eb64 (diff) |
sysctl: 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/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 26f65eaa01f9..33f71f37267e 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -565,7 +565,7 @@ static struct ctl_table kern_table[] = { | |||
565 | .extra2 = &one, | 565 | .extra2 = &one, |
566 | }, | 566 | }, |
567 | #endif | 567 | #endif |
568 | #ifdef CONFIG_HOTPLUG | 568 | |
569 | { | 569 | { |
570 | .procname = "hotplug", | 570 | .procname = "hotplug", |
571 | .data = &uevent_helper, | 571 | .data = &uevent_helper, |
@@ -573,7 +573,7 @@ static struct ctl_table kern_table[] = { | |||
573 | .mode = 0644, | 573 | .mode = 0644, |
574 | .proc_handler = proc_dostring, | 574 | .proc_handler = proc_dostring, |
575 | }, | 575 | }, |
576 | #endif | 576 | |
577 | #ifdef CONFIG_CHR_DEV_SG | 577 | #ifdef CONFIG_CHR_DEV_SG |
578 | { | 578 | { |
579 | .procname = "sg-big-buff", | 579 | .procname = "sg-big-buff", |