summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-10-20 02:23:25 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-20 03:04:22 +0200
commitc1cb8e48bddd9e16ef488ea5d50885908c5a4081 (patch)
treea4df1a782b9bfe1002dd01bbeb0020da93a7e746 /kernel
parentMerge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86 (diff)
downloadlinux-c1cb8e48bddd9e16ef488ea5d50885908c5a4081.tar.xz
linux-c1cb8e48bddd9e16ef488ea5d50885908c5a4081.zip
sysctl: Don't compile sysctl_check when !CONFIG_SYSCTL
Weird I thought I had written the makefile so this would be handled. Oh well this should fix it. Sorry about that. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Acked-and-tested-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/Makefile b/kernel/Makefile
index 05c3e6df8597..79f017e09fbd 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -9,8 +9,9 @@ obj-y = sched.o fork.o exec_domain.o panic.o printk.o profile.o \
rcupdate.o extable.o params.o posix-timers.o \
kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \
hrtimer.o rwsem.o latency.o nsproxy.o srcu.o \
- utsname.o sysctl_check.o notifier.o
+ utsname.o notifier.o
+obj-$(CONFIG_SYSCTL) += sysctl_check.o
obj-$(CONFIG_STACKTRACE) += stacktrace.o
obj-y += time/
obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o