Merge branch 'tracing/ftrace' into tracing/urgent

[linux-2.6-omap-h63xx.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ea52fae33290a2d9c2baffab08d58f83407c0c22..600733426ae04e33042646f41a3579965288ce2f 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -8,6 +8,7 @@ mainmenu "Linux Kernel Configuration"
 config ARM
        bool
        default y
 config ARM
        bool
        default y

+       select HAVE_AOUT

        select HAVE_IDE
        select RTC_LIB
        select SYS_SUPPORTS_APM_EMULATION
        select HAVE_IDE
        select RTC_LIB
        select SYS_SUPPORTS_APM_EMULATION


@@ -15,8 +16,8 @@ config ARM
        select HAVE_ARCH_KGDB
        select HAVE_KPROBES if (!XIP_KERNEL)
        select HAVE_KRETPROBES if (HAVE_KPROBES)
        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_DYNAMIC_FTRACE if (HAVE_FUNCTION_TRACER)

        select HAVE_GENERIC_DMA_COHERENT
        help
          The ARM series is a line of low-power-consumption RISC chip designs
        select HAVE_GENERIC_DMA_COHERENT
        help
          The ARM series is a line of low-power-consumption RISC chip designs


@@ -140,9 +141,6 @@ config GENERIC_CALIBRATE_DELAY
        bool
        default y
 
        bool
        default y
 

-config ARCH_SUPPORTS_AOUT
-       def_bool y
-

 config ARCH_MAY_HAVE_PC_FDC
        bool
 
 config ARCH_MAY_HAVE_PC_FDC
        bool
 


@@ -194,6 +192,8 @@ config VECTORS_BASE
 
 source "init/Kconfig"
 
 
 source "init/Kconfig"
 

+source "kernel/Kconfig.freezer"
+

 menu "System Type"
 
 choice
 menu "System Type"
 
 choice


@@ -441,7 +441,7 @@ config ARCH_ORION5X
        help
          Support for the following Marvell Orion 5x series SoCs:
          Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),
        help
          Support for the following Marvell Orion 5x series SoCs:
          Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),

-         Orion-2 (5281).
+         Orion-2 (5281), Orion-1-90 (6183).

 
 config ARCH_PNX4008
        bool "Philips Nexperia PNX4008 Mobile"
 
 config ARCH_PNX4008
        bool "Philips Nexperia PNX4008 Mobile"


@@ -524,6 +524,7 @@ config ARCH_DAVINCI
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select GENERIC_GPIO
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select GENERIC_GPIO

+       select ARCH_REQUIRE_GPIOLIB

        select HAVE_CLK
        select ZONE_DMA
        help
        select HAVE_CLK
        select ZONE_DMA
        help


@@ -843,6 +844,11 @@ config OABI_COMPAT
          UNPREDICTABLE (in fact it can be predicted that it won't work
          at all). If in doubt say Y.
 
          UNPREDICTABLE (in fact it can be predicted that it won't work
          at all). If in doubt say Y.
 

+config ARCH_FLATMEM_HAS_HOLES
+       bool
+       default y
+       depends on FLATMEM
+

 # Discontigmem is deprecated
 config ARCH_DISCONTIGMEM_ENABLE
        bool
 # Discontigmem is deprecated
 config ARCH_DISCONTIGMEM_ENABLE
        bool


@@ -871,7 +877,7 @@ config LEDS
                   ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \
                   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
                   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
                   ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \
                   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
                   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \

-                  ARCH_AT91 || MACH_TRIZEPS4 || ARCH_DAVINCI || \
+                  ARCH_AT91 || ARCH_DAVINCI || \

                   ARCH_KS8695 || MACH_RD88F5182
        help
          If you say Y here, the LEDs on your machine will be used
                   ARCH_KS8695 || MACH_RD88F5182
        help
          If you say Y here, the LEDs on your machine will be used