X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=arch%2Farm%2FKconfig;h=db4f2ee3a75023d1f7df1b1ef1ca38dc7d4b842b;hb=5da3e714e30d40145f4dd37d79de6bbbcb9e6137;hp=1f254bd6c937ece2e6d6a6b1040d954cc923cd7a;hpb=e4ce30f3779c2ddaa7dfaa4042209e5dbacbada5;p=pandora-kernel.git

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1f254bd6c937..db4f2ee3a750 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -955,7 +955,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
 
@@ -1188,6 +1189,7 @@ config HZ
 	default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210
 	default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER
 	default AT91_TIMER_HZ if ARCH_AT91
+	default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE
 	default 100
 
 config THUMB2_KERNEL