diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /arch/sh/kernel/Makefile | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/sh/kernel/Makefile')
| -rw-r--r-- | arch/sh/kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/kernel/Makefile b/arch/sh/kernel/Makefile index ff30d7f58043..9104b6257644 100644 --- a/arch/sh/kernel/Makefile +++ b/arch/sh/kernel/Makefile | |||
| @@ -20,5 +20,6 @@ obj-$(CONFIG_SH_CPU_FREQ) += cpufreq.o | |||
| 20 | obj-$(CONFIG_MODULES) += module.o | 20 | obj-$(CONFIG_MODULES) += module.o |
| 21 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o | 21 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o |
| 22 | obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o | 22 | obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o |
| 23 | obj-$(CONFIG_CRASH_DUMP) += crash_dump.o | ||
| 23 | obj-$(CONFIG_PM) += pm.o | 24 | obj-$(CONFIG_PM) += pm.o |
| 24 | obj-$(CONFIG_STACKTRACE) += stacktrace.o | 25 | obj-$(CONFIG_STACKTRACE) += stacktrace.o |