diff options
| author | Ian Abbott <abbotti@mev.co.uk> | 2010-06-07 13:57:12 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-05 22:53:33 +0200 |
| commit | 94f17cd7887ca681ea88fda1fd9bf65c0ca161f0 (patch) | |
| tree | 9606c654afd4cf939dd4557d33fa28467f514050 /kernel/sysctl.c | |
| parent | uio: Remove IRQF_DISABLED flag from uio_cif.c (diff) | |
| download | linux-94f17cd7887ca681ea88fda1fd9bf65c0ca161f0.tar.xz linux-94f17cd7887ca681ea88fda1fd9bf65c0ca161f0.zip | |
hotplug: Support kernel/hotplug sysctl variable when !CONFIG_NET
The kernel/hotplug sysctl variable (/proc/sys/kernel/hotplug file) was
made conditional on CONFIG_NET by commit
f743ca5e10f4145e0b3e6d11b9b46171e16af7ce (applied in 2.6.18) to fix
problems with undefined references in 2.6.16 when CONFIG_HOTPLUG=y &&
!CONFIG_NET, but this restriction is no longer needed.
This patch makes the kernel/hotplug sysctl variable depend only on
CONFIG_HOTPLUG.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Acked-by: Randy Dunlap <randy.dunlap@oracle.COM>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index d24f761f4876..f73da1c857eb 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -562,7 +562,7 @@ static struct ctl_table kern_table[] = { .extra2 = &one, }, #endif -#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET) +#ifdef CONFIG_HOTPLUG { .procname = "hotplug", .data = &uevent_helper, |