From 0ffa95b399ce7f0d2886bcebc063cffee1707023 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Fri, 23 Jun 2006 02:05:47 -0700
Subject: [PATCH] --- yaml --- r: 29067 b: refs/heads/master c:
 57ae2508610d50893cb3e3bbb869ff70ff724a2a h: refs/heads/master i:   29065:
 9026095a5ce5e6fe5e539074533f93d7e7b86f0a   29063:
 e3ddc9ac037654ab49c1bc852c433b30c932cec9 v: v3

---
 [refs]                | 2 +-
 trunk/kernel/sysctl.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6e7105688196..353f0026f7e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: deb0e9b234af24f4a827757fae9ff5542a3d2a12
+refs/heads/master: 57ae2508610d50893cb3e3bbb869ff70ff724a2a
diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c
index 072ac446810a..eb8bd214e7d7 100644
--- a/trunk/kernel/sysctl.c
+++ b/trunk/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",