Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable

[net-next-2.6.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f160b93691cd66c5a2e133e0bd14d1e52f551ad8..44b6d9b424834b6b5c62ce38a4b88a14520dfdcd 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -586,6 +586,7 @@ config ARCH_MSM
        bool "Qualcomm MSM"
        select HAVE_CLK
        select GENERIC_CLOCKEVENTS
+       select ARCH_REQUIRE_GPIOLIB
        help
          Support for Qualcomm MSM/QSD based systems.  This runs on the
          apps processor of the MSM/QSD and depends on a shared memory
@@ -955,7 +956,8 @@ config XSCALE_PMU
        default y
 
 config CPU_HAS_PMU
-       depends on CPU_V6 || CPU_V7 || XSCALE_PMU
+       depends on (CPU_V6 || CPU_V7 || XSCALE_PMU) && \
+                  (!ARCH_OMAP3 || OMAP3_EMU)
        default y
        bool