diff --git a/[refs] b/[refs] index a6d7f1d0b7b3..712aa9dbcd86 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80fd662683be5dc2a3b41b27e30942d5fd7b5d5c +refs/heads/master: a5f08c1ce08f2d8ce9a0e3e35a4c32e875fb7225 diff --git a/trunk/kernel/Makefile b/trunk/kernel/Makefile index 05c3e6df8597..79f017e09fbd 100644 --- a/trunk/kernel/Makefile +++ b/trunk/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