diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 12:43:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 12:43:09 -0400 |
commit | 515b696b282f856c3ad1679ccd658120faa387d0 (patch) | |
tree | d9d7c1185c396617f128ca23463062308d11393b /arch/sh/kernel/Makefile | |
parent | fa877c71e2136bd682b45022c96d5e073ced9f58 (diff) | |
parent | 064a16dc41be879d12bd5de5d2f9d38d890e0ee7 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (262 commits)
sh: mach-ecovec24: Add user debug switch support
sh: Kill off unused se_skipped in alignment trap notification code.
sh: Wire up HAVE_SYSCALL_TRACEPOINTS.
video: sh_mobile_lcdcfb: use both register sets for display panning
video: sh_mobile_lcdcfb: implement display panning
sh: Fix up sh7705 flush_dcache_page() build.
sh: kfr2r09: document the PLL/FLL <-> RF relationship.
sh: mach-ecovec24: need asm/clock.h.
sh: mach-ecovec24: deassert usb irq on boot.
sh: Add KEYSC support for EcoVec24
sh: add kycr2_delay for sh_keysc
sh: cpufreq: Include CPU id in info messages.
sh: multi-evt support for SH-X3 proto CPU.
sh: clkfwk: remove bogus set_bus_parent() from SH7709.
sh: Fix the indication point of the liquid crystal of AP-325RXA(AP3300)
sh: Add EcoVec24 romImage defconfig
sh: USB disable process is needed if romImage boot for EcoVec24
sh: EcoVec24: add HIZA setting for LED
sh: EcoVec24: write MAC address in boot
sh: Add romImage support for EcoVec24
...
Diffstat (limited to 'arch/sh/kernel/Makefile')
-rw-r--r-- | arch/sh/kernel/Makefile | 44 |
1 files changed, 40 insertions, 4 deletions
diff --git a/arch/sh/kernel/Makefile b/arch/sh/kernel/Makefile index 349d833deab5..a2d0a40f3848 100644 --- a/arch/sh/kernel/Makefile +++ b/arch/sh/kernel/Makefile | |||
@@ -1,5 +1,41 @@ | |||
1 | ifeq ($(CONFIG_SUPERH32),y) | 1 | # |
2 | include ${srctree}/arch/sh/kernel/Makefile_32 | 2 | # Makefile for the Linux/SuperH kernel. |
3 | else | 3 | # |
4 | include ${srctree}/arch/sh/kernel/Makefile_64 | 4 | |
5 | extra-y := head_$(BITS).o init_task.o vmlinux.lds | ||
6 | |||
7 | ifdef CONFIG_FUNCTION_TRACER | ||
8 | # Do not profile debug and lowlevel utilities | ||
9 | CFLAGS_REMOVE_ftrace.o = -pg | ||
5 | endif | 10 | endif |
11 | |||
12 | obj-y := debugtraps.o dumpstack.o idle.o io.o io_generic.o irq.o \ | ||
13 | machvec.o nmi_debug.o process_$(BITS).o ptrace_$(BITS).o \ | ||
14 | setup.o signal_$(BITS).o sys_sh.o sys_sh$(BITS).o \ | ||
15 | syscalls_$(BITS).o time.o topology.o traps.o \ | ||
16 | traps_$(BITS).o unwinder.o | ||
17 | |||
18 | obj-y += cpu/ | ||
19 | obj-$(CONFIG_VSYSCALL) += vsyscall/ | ||
20 | obj-$(CONFIG_SMP) += smp.o | ||
21 | obj-$(CONFIG_SH_STANDARD_BIOS) += sh_bios.o | ||
22 | obj-$(CONFIG_KGDB) += kgdb.o | ||
23 | obj-$(CONFIG_SH_CPU_FREQ) += cpufreq.o | ||
24 | obj-$(CONFIG_MODULES) += sh_ksyms_$(BITS).o module.o | ||
25 | obj-$(CONFIG_EARLY_PRINTK) += early_printk.o | ||
26 | obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o | ||
27 | obj-$(CONFIG_CRASH_DUMP) += crash_dump.o | ||
28 | obj-$(CONFIG_STACKTRACE) += stacktrace.o | ||
29 | obj-$(CONFIG_IO_TRAPPED) += io_trapped.o | ||
30 | obj-$(CONFIG_KPROBES) += kprobes.o | ||
31 | obj-$(CONFIG_GENERIC_GPIO) += gpio.o | ||
32 | obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o | ||
33 | obj-$(CONFIG_FTRACE_SYSCALLS) += ftrace.o | ||
34 | obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o | ||
35 | obj-$(CONFIG_DUMP_CODE) += disassemble.o | ||
36 | obj-$(CONFIG_HIBERNATION) += swsusp.o | ||
37 | obj-$(CONFIG_DWARF_UNWINDER) += dwarf.o | ||
38 | |||
39 | obj-$(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) += localtimer.o | ||
40 | |||
41 | EXTRA_CFLAGS += -Werror | ||