summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-06-23 02:05:47 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-23 07:43:06 -0700
commit57ae2508610d50893cb3e3bbb869ff70ff724a2a (patch)
tree33109c6d78be1b6e5db085a57a4509fcfd88ee95 /kernel
parentdeb0e9b234af24f4a827757fae9ff5542a3d2a12 (diff)
downloadblackbird-obmc-linux-57ae2508610d50893cb3e3bbb869ff70ff724a2a.tar.gz
blackbird-obmc-linux-57ae2508610d50893cb3e3bbb869ff70ff724a2a.zip
[PATCH] CONFIG_NET=n build fix
Cc: Greg KH <greg@kroah.com> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sysctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 072ac446810a..eb8bd214e7d7 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -399,7 +399,7 @@ static ctl_table kern_table[] = {
.strategy = &sysctl_string,
},
#endif
-#ifdef CONFIG_HOTPLUG
+#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
{
.ctl_name = KERN_HOTPLUG,
.procname = "hotplug",
OpenPOWER on IntegriCloud