diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-10 08:18:06 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-10 08:18:06 +0200 |
| commit | a0b71bbb90c5c23a5c319d0a070cc1702d9ead3d (patch) | |
| tree | 2503df07b699f5d66a71b2823e7d1703f89cfc1c /kernel/Makefile | |
| parent | 43ecfde754fa36d769038891730936bec802fb3d (diff) | |
| parent | 19379b11819efc1fc3b602e64f7e7531050aaddb (diff) | |
Merge branch 'sched/core' into auto-latest
Conflicts:
drivers/cpufreq/cpufreq_ondemand.c
Diffstat (limited to 'kernel/Makefile')
| -rw-r--r-- | kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index d5c30060ac14..d9fa7d8605f5 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -68,7 +68,7 @@ obj-$(CONFIG_USER_NS) += user_namespace.o obj-$(CONFIG_PID_NS) += pid_namespace.o obj-$(CONFIG_IKCONFIG) += configs.o obj-$(CONFIG_RESOURCE_COUNTERS) += res_counter.o -obj-$(CONFIG_STOP_MACHINE) += stop_machine.o +obj-$(CONFIG_SMP) += stop_machine.o obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o obj-$(CONFIG_AUDIT) += audit.o auditfilter.o audit_watch.o obj-$(CONFIG_AUDITSYSCALL) += auditsc.o |