Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[sfrench/cifs-2.6.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f504c801792f0d2c39db222970ad0bdb9e317c3d..9722f8bb506cb9ad27f64b47ab15ce428886a0ba 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -16,8 +16,7 @@ config ARM
        select HAVE_ARCH_KGDB
        select HAVE_KPROBES if (!XIP_KERNEL)
        select HAVE_KRETPROBES if (HAVE_KPROBES)
-       select HAVE_FTRACE if (!XIP_KERNEL)
-       select HAVE_DYNAMIC_FTRACE if (HAVE_FTRACE)
+       select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
        select HAVE_GENERIC_DMA_COHERENT
        help
          The ARM series is a line of low-power-consumption RISC chip designs
@@ -540,16 +539,15 @@ config ARCH_OMAP
        help
          Support for TI's OMAP platform (OMAP1 and OMAP2).
 
-config ARCH_MSM7X00A
-       bool "Qualcomm MSM7X00A"
+config ARCH_MSM
+       bool "Qualcomm MSM"
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        help
-         Support for Qualcomm MSM7X00A based systems.  This runs on the ARM11
-         apps processor of the MSM7X00A and depends on a shared memory
+         Support for Qualcomm MSM7K based systems.  This runs on the ARM11
+         apps processor of the MSM7K and depends on a shared memory
          interface to the ARM9 modem processor which runs the baseband stack
          and controls some vital subsystems (clock and power control, etc).
-         <http://www.cdmatech.com/products/msm7200_chipset_solution.jsp>
 
 endchoice