projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
896f0c0
f875295
)
Merge branch 'sh/stable-updates'
author
Paul Mundt
<lethal@linux-sh.org>
Fri, 16 Oct 2009 09:16:02 +0000
(18:16 +0900)
committer
Paul Mundt
<lethal@linux-sh.org>
Fri, 16 Oct 2009 09:16:02 +0000
(18:16 +0900)
Conflicts:
arch/sh/Kconfig
1
2
arch/sh/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/sh/Kconfig
index
5260fb5
,
0dc7e3c
..
266d422
---
1
/
arch/sh/Kconfig
---
2
/
arch/sh/Kconfig
+++ b/
arch/sh/Kconfig
@@@
-37,8
-37,6
+37,7
@@@
config SUPERH3
select HAVE_FTRACE_MCOUNT_RECORD
select HAVE_DYNAMIC_FTRACE
select HAVE_FUNCTION_TRACE_MCOUNT_TEST
- select HAVE_FTRACE_SYSCALLS
+ select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
select HAVE_FUNCTION_GRAPH_TRACER
select HAVE_ARCH_KGDB
select ARCH_HIBERNATION_POSSIBLE if MMU