diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-27 05:42:48 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-27 05:42:52 -0400 |
| commit | 4708ac49305bbcd511600d4af71a4c6dca15af65 (patch) | |
| tree | 77ba5c83a7d4f4a119e3fd524d82adc297df1e35 /arch/arm/Kconfig | |
| parent | 1dbd30e9890fd69e50b17edd70ca583546b0fe4e (diff) | |
| parent | 2f7989efd4398d92b8adffce2e07dd043a0895fe (diff) | |
Merge branch 'origin' into misc
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5f3a9da6da07..8ef1e23a24a2 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -956,7 +956,8 @@ config XSCALE_PMU | |||
| 956 | default y | 956 | default y |
| 957 | 957 | ||
| 958 | config CPU_HAS_PMU | 958 | config CPU_HAS_PMU |
| 959 | depends on CPU_V6 || CPU_V7 || XSCALE_PMU | 959 | depends on (CPU_V6 || CPU_V7 || XSCALE_PMU) && \ |
| 960 | (!ARCH_OMAP3 || OMAP3_EMU) | ||
| 960 | default y | 961 | default y |
| 961 | bool | 962 | bool |
| 962 | 963 | ||