diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-07-24 11:49:13 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-07-24 11:49:13 -0400 |
| commit | 4e4f62bf7396fca48efe61513640ee399a6046e3 (patch) | |
| tree | 42a503af02d9806bcc05e5fcc2cd53f9bd45b0c2 /arch/sparc/Kconfig | |
| parent | 9e3288dc9a94fab5ea87db42177d3a9e0345a614 (diff) | |
| parent | b37fa16e78d6f9790462b3181602a26b5af36260 (diff) | |
Merge commit 'v2.6.35-rc6' into devicetree/next
Conflicts:
arch/sparc/kernel/prom_64.c
Diffstat (limited to 'arch/sparc/Kconfig')
| -rw-r--r-- | arch/sparc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 13a9f2f8738c..ba068c833e5d 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
| @@ -43,7 +43,7 @@ config SPARC64 | |||
| 43 | select HAVE_FUNCTION_TRACE_MCOUNT_TEST | 43 | select HAVE_FUNCTION_TRACE_MCOUNT_TEST |
| 44 | select HAVE_KRETPROBES | 44 | select HAVE_KRETPROBES |
| 45 | select HAVE_KPROBES | 45 | select HAVE_KPROBES |
| 46 | select HAVE_LMB | 46 | select HAVE_MEMBLOCK |
| 47 | select HAVE_SYSCALL_WRAPPERS | 47 | select HAVE_SYSCALL_WRAPPERS |
| 48 | select HAVE_DYNAMIC_FTRACE | 48 | select HAVE_DYNAMIC_FTRACE |
| 49 | select HAVE_FTRACE_MCOUNT_RECORD | 49 | select HAVE_FTRACE_MCOUNT_RECORD |