diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 17:39:33 +0100 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 17:39:33 +0100 |
commit | 944d79559d154c12becde0dab327016cf438f46c (patch) | |
tree | 50c101806f4d3b6585222dda060559eb4f3e005a /arch/sh/kernel/Makefile | |
parent | Merge branch 'master' of /usr/src/ntfs-2.6/ (diff) | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff) | |
download | linux-944d79559d154c12becde0dab327016cf438f46c.tar.xz linux-944d79559d154c12becde0dab327016cf438f46c.zip |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'arch/sh/kernel/Makefile')
-rw-r--r-- | arch/sh/kernel/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/sh/kernel/Makefile b/arch/sh/kernel/Makefile index 8b819698df14..7a86eeb22655 100644 --- a/arch/sh/kernel/Makefile +++ b/arch/sh/kernel/Makefile @@ -17,6 +17,4 @@ obj-$(CONFIG_SH_KGDB) += kgdb_stub.o kgdb_jmp.o obj-$(CONFIG_SH_CPU_FREQ) += cpufreq.o obj-$(CONFIG_MODULES) += module.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o - -USE_STANDARD_AS_RULE := true - +obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o |