Commit 94f17cd7 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

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
f743ca5e (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: default avatarIan Abbott <abbotti@mev.co.uk>
Acked-by: default avatarRandy Dunlap <randy.dunlap@oracle.COM>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 14ec5394
...@@ -562,7 +562,7 @@ static struct ctl_table kern_table[] = { ...@@ -562,7 +562,7 @@ static struct ctl_table kern_table[] = {
.extra2 = &one, .extra2 = &one,
}, },
#endif #endif
#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET) #ifdef CONFIG_HOTPLUG
{ {
.procname = "hotplug", .procname = "hotplug",
.data = &uevent_helper, .data = &uevent_helper,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment