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 10:33:03 -0800 |
| commit | 3b572b506c76a7a38c8debe45b50d09295620810 (patch) | |
| tree | f1a6e47c3eadc04f44f3ba086712ad853cea992a /kernel/sysctl.c | |
| parent | 1c9a9f59149e247e264db1fbf9f8ea3d5066eb64 (diff) | |
| download | linux-3.10-3b572b506c76a7a38c8debe45b50d09295620810.tar.gz linux-3.10-3b572b506c76a7a38c8debe45b50d09295620810.tar.bz2 linux-3.10-3b572b506c76a7a38c8debe45b50d09295620810.zip | |
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 26f65eaa01f..33f71f37267 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -565,7 +565,7 @@ static struct ctl_table kern_table[] = { .extra2 = &one, }, #endif -#ifdef CONFIG_HOTPLUG + { .procname = "hotplug", .data = &uevent_helper, @@ -573,7 +573,7 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = proc_dostring, }, -#endif + #ifdef CONFIG_CHR_DEV_SG { .procname = "sg-big-buff", |