Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[pandora-kernel.git] / kernel / Makefile

diff --git a/kernel/Makefile b/kernel/Makefile
index 6c5f081..1c9938a 100644 (file)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -9,9 +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 nsproxy.o srcu.o semaphore.o \
-           notifier.o ksysfs.o pm_qos_params.o
+           notifier.o ksysfs.o pm_qos_params.o sched_clock.o
 
-obj-$(CONFIG_SYSCTL) += sysctl_check.o
+obj-$(CONFIG_SYSCTL_SYSCALL_CHECK) += sysctl_check.o
 obj-$(CONFIG_STACKTRACE) += stacktrace.o
 obj-y += time/
 obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o