Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[deliverable/linux.git] / kernel / sysctl.c

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 26f65eaa01f9c94366aa5156f9c304bbc589808f..33f71f37267e48e2b2b59b4d11f93761dc1e9e89 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -565,7 +565,7 @@ static struct ctl_table kern_table[] = {
                .extra2         = &one,
        },
 #endif
-#ifdef CONFIG_HOTPLUG
+
        {
                .procname       = "hotplug",
                .data           = &uevent_helper,
@@ -573,7 +573,7 @@ static struct ctl_table kern_table[] = {
                .mode           = 0644,
                .proc_handler   = proc_dostring,
        },
-#endif
+
 #ifdef CONFIG_CHR_DEV_SG
        {
                .procname       = "sg-big-buff",