diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-26 07:02:23 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-26 07:02:23 -0500 |
| commit | 8e818179eb9e8f9e44d8410dd2a25077d026a08e (patch) | |
| tree | 7d08afd30c95c04129c20693d974a18799caeb5a /kernel/Makefile | |
| parent | 742bd95ba96e19b3f7196c3a0834ebc17c8ba006 (diff) | |
| parent | ecc25fbd6b9e07b33895c61ddf84006b00f55d99 (diff) | |
Merge branch 'x86/core' into perfcounters/core
Conflicts:
arch/x86/kernel/apic/apic.c
arch/x86/kernel/irqinit_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/Makefile')
| -rw-r--r-- | kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index 5537554ed808..9ef39e5b0211 100644 --- a/kernel/Makefile +++ b/kernel/Makefile | |||
| @@ -51,6 +51,7 @@ obj-$(CONFIG_UID16) += uid16.o | |||
| 51 | obj-$(CONFIG_MODULES) += module.o | 51 | obj-$(CONFIG_MODULES) += module.o |
| 52 | obj-$(CONFIG_KALLSYMS) += kallsyms.o | 52 | obj-$(CONFIG_KALLSYMS) += kallsyms.o |
| 53 | obj-$(CONFIG_PM) += power/ | 53 | obj-$(CONFIG_PM) += power/ |
| 54 | obj-$(CONFIG_FREEZER) += power/ | ||
| 54 | obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o | 55 | obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o |
| 55 | obj-$(CONFIG_KEXEC) += kexec.o | 56 | obj-$(CONFIG_KEXEC) += kexec.o |
| 56 | obj-$(CONFIG_BACKTRACE_SELF_TEST) += backtracetest.o | 57 | obj-$(CONFIG_BACKTRACE_SELF_TEST) += backtracetest.o |