From 0b00ca769e783530f5fa01ca5a77656906f75160 Mon Sep 17 00:00:00 2001
From: Ian Abbott <abbotti@mev.co.uk>
Date: Mon, 7 Jun 2010 12:57:12 +0100
Subject: [PATCH] --- yaml --- r: 205516 b: refs/heads/master c:
 94f17cd7887ca681ea88fda1fd9bf65c0ca161f0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 103d94fc282d..136ed81b9740 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14ec5394827eea8df7bbf14775c52fc48fc97a40
+refs/heads/master: 94f17cd7887ca681ea88fda1fd9bf65c0ca161f0
diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c
index d24f761f4876..f73da1c857eb 100644
--- a/trunk/kernel/sysctl.c
+++ b/trunk/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,