diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-30 10:26:45 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-30 10:26:45 -0400 |
| commit | 05cd2544f4b64d9a9eca0d170191867495e01feb (patch) | |
| tree | 10146fb79bba464bac6f620d03b8cd50285065b7 /arch/arm/Kconfig | |
| parent | 27f680adc65ca08bf72ed85d3a48d1ee70f77c7a (diff) | |
| parent | a0601c8944dc08c2d349c24bd9c0b09c406229fc (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5021db2217ed..9722f8bb506c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -16,8 +16,7 @@ config ARM | |||
| 16 | select HAVE_ARCH_KGDB | 16 | select HAVE_ARCH_KGDB |
| 17 | select HAVE_KPROBES if (!XIP_KERNEL) | 17 | select HAVE_KPROBES if (!XIP_KERNEL) |
| 18 | select HAVE_KRETPROBES if (HAVE_KPROBES) | 18 | select HAVE_KRETPROBES if (HAVE_KPROBES) |
| 19 | select HAVE_FTRACE if (!XIP_KERNEL) | 19 | select HAVE_FUNCTION_TRACER if (!XIP_KERNEL) |
| 20 | select HAVE_DYNAMIC_FTRACE if (HAVE_FTRACE) | ||
| 21 | select HAVE_GENERIC_DMA_COHERENT | 20 | select HAVE_GENERIC_DMA_COHERENT |
| 22 | help | 21 | help |
| 23 | The ARM series is a line of low-power-consumption RISC chip designs | 22 | The ARM series is a line of low-power-consumption RISC chip designs |