Merge branch 'master' into for-next

[firefly-linux-kernel-4.4.55.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 44789eff983f444c22cd967cbe418f7e50159358..98975f58e19e21bef0850eb31418bfc5c32a4d1b 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1133,10 +1133,9 @@ config IWMMXT
          Enable support for iWMMXt context switching at run time if
          running on a CPU that supports it.
 
-#  bool 'Use XScale PMU as timer source' CONFIG_XSCALE_PMU_TIMER
 config XSCALE_PMU
        bool
-       depends on CPU_XSCALE && !XSCALE_PMU_TIMER
+       depends on CPU_XSCALE
        default y
 
 config CPU_HAS_PMU