Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...

[pandora-kernel.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index dabb015..4b8acd2 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -17,6 +17,7 @@ config ARM
        select HAVE_KRETPROBES if (HAVE_KPROBES)
        select HAVE_FTRACE if (!XIP_KERNEL)
        select HAVE_DYNAMIC_FTRACE if (HAVE_FTRACE)
        select HAVE_KRETPROBES if (HAVE_KPROBES)
        select HAVE_FTRACE if (!XIP_KERNEL)
        select HAVE_DYNAMIC_FTRACE if (HAVE_FTRACE)

+       select HAVE_GENERIC_DMA_COHERENT

        help
          The ARM series is a line of low-power-consumption RISC chip designs
          licensed by ARM Ltd and targeted at embedded applications and
        help
          The ARM series is a line of low-power-consumption RISC chip designs
          licensed by ARM Ltd and targeted at embedded applications and


@@ -234,6 +235,7 @@ config ARCH_VERSATILE
 config ARCH_AT91
        bool "Atmel AT91"
        select GENERIC_GPIO
 config ARCH_AT91
        bool "Atmel AT91"
        select GENERIC_GPIO

+       select HAVE_CLK

        help
          This enables support for systems based on the Atmel AT91RM9200,
          AT91SAM9 and AT91CAP9 processors.
        help
          This enables support for systems based on the Atmel AT91RM9200,
          AT91SAM9 and AT91CAP9 processors.


@@ -267,7 +269,6 @@ config ARCH_EP93XX
        select ARM_VIC
        select GENERIC_GPIO
        select HAVE_CLK
        select ARM_VIC
        select GENERIC_GPIO
        select HAVE_CLK

-       select HAVE_CLK

        select ARCH_REQUIRE_GPIOLIB
        help
          This enables support for the Cirrus EP93xx series of CPUs.
        select ARCH_REQUIRE_GPIOLIB
        help
          This enables support for the Cirrus EP93xx series of CPUs.


@@ -314,7 +315,7 @@ config ARCH_IOP32X
        select PLAT_IOP
        select PCI
        select GENERIC_GPIO
        select PLAT_IOP
        select PCI
        select GENERIC_GPIO

-       select HAVE_GPIO_LIB
+       select ARCH_REQUIRE_GPIOLIB

        help
          Support for Intel's 80219 and IOP32X (XScale) family of
          processors.
        help
          Support for Intel's 80219 and IOP32X (XScale) family of
          processors.


@@ -325,7 +326,7 @@ config ARCH_IOP33X
        select PLAT_IOP
        select PCI
        select GENERIC_GPIO
        select PLAT_IOP
        select PCI
        select GENERIC_GPIO

-       select HAVE_GPIO_LIB
+       select ARCH_REQUIRE_GPIOLIB

        help
          Support for Intel's IOP33X (XScale) family of processors.
 
        help
          Support for Intel's IOP33X (XScale) family of processors.
 


@@ -418,7 +419,7 @@ config ARCH_MXC
        select GENERIC_CLOCKEVENTS
        select ARCH_MTD_XIP
        select GENERIC_GPIO
        select GENERIC_CLOCKEVENTS
        select ARCH_MTD_XIP
        select GENERIC_GPIO

-       select HAVE_GPIO_LIB
+       select ARCH_REQUIRE_GPIOLIB

        help
          Support for Freescale MXC/iMX-based family of processors
 
        help
          Support for Freescale MXC/iMX-based family of processors
 


@@ -1224,6 +1225,8 @@ source "drivers/dma/Kconfig"
 
 source "drivers/dca/Kconfig"
 
 
 source "drivers/dca/Kconfig"
 

+source "drivers/regulator/Kconfig"
+

 source "drivers/uio/Kconfig"
 
 endmenu
 source "drivers/uio/Kconfig"
 
 endmenu