diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-22 18:09:07 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-22 18:09:07 -0400 |
| commit | 3ad55155b222f2a901405dea20ff7c68828ecd92 (patch) | |
| tree | 53b24c981387b037084a333dc5ae23be8e82ef4a /arch/arm/Kconfig | |
| parent | 06f365acef5ca54fd5708a0d853c4a89609536f1 (diff) | |
| parent | 6645cb61f3a1186a71475385d33f875dd8fb38bf (diff) | |
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/kernel/entry-armv.S
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 84fda2bebd7a..894487479f37 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -10,7 +10,7 @@ config ARM | |||
| 10 | select GENERIC_ATOMIC64 if (CPU_V6 || !CPU_32v6K || !AEABI) | 10 | select GENERIC_ATOMIC64 if (CPU_V6 || !CPU_32v6K || !AEABI) |
| 11 | select HAVE_OPROFILE if (HAVE_PERF_EVENTS) | 11 | select HAVE_OPROFILE if (HAVE_PERF_EVENTS) |
| 12 | select HAVE_ARCH_KGDB | 12 | select HAVE_ARCH_KGDB |
| 13 | select HAVE_KPROBES if (!XIP_KERNEL && !THUMB2_KERNEL) | 13 | select HAVE_KPROBES if !XIP_KERNEL |
| 14 | select HAVE_KRETPROBES if (HAVE_KPROBES) | 14 | select HAVE_KRETPROBES if (HAVE_KPROBES) |
| 15 | select HAVE_FUNCTION_TRACER if (!XIP_KERNEL) | 15 | select HAVE_FUNCTION_TRACER if (!XIP_KERNEL) |
| 16 | select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL) | 16 | select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL) |