someOS/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branches 'sh/xstate', 'sh/hw-breakpoints' and 'sh/stable-updates'

Browse Source
This commit is contained in:
Paul Mundt
2010-01-13 13:02:55 +09:00
parent 6430a5987f 0ea820cf9b fa94ddea2b 066000dd85
commit 644755e786
665 changed files with 12479 additions and 6811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/sh/kernel/Makefile
View File

@@ -13,8 +13,8 @@ CFLAGS_REMOVE_return_address.o = -pg
obj-y := debugtraps.o dma-nommu.o dumpstack.o \
idle.o io.o io_generic.o irq.o \
irq_$(BITS).o machvec.o nmi_debug.o process_$(BITS).o \
ptrace_$(BITS).o return_address.o \
irq_$(BITS).o machvec.o nmi_debug.o process.o \
process_$(BITS).o ptrace_$(BITS).o return_address.o \
setup.o signal_$(BITS).o sys_sh.o sys_sh$(BITS).o \
syscalls_$(BITS).o time.o topology.o traps.o \
traps_$(BITS).o unwinder.o
@@ -39,6 +39,7 @@ obj-$(CONFIG_HIBERNATION) += swsusp.o
obj-$(CONFIG_DWARF_UNWINDER) += dwarf.o
obj-$(CONFIG_PERF_EVENTS) += perf_event.o perf_callchain.o
obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o
obj-$(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) += localtimer.o
EXTRA_CFLAGS += -Werror