diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-21 04:22:45 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-21 04:22:45 -0400 |
| commit | 14764b01a5576ce23a9d0c95a027049206a19cef (patch) | |
| tree | fa7f4e3b9b62598076baf7d312dd37d6c91b0d56 /arch/arm/Kconfig | |
| parent | fc4978b796e5e52ab3a709495a968199afe0a108 (diff) | |
| parent | 5ccd4302a20bfe56eb72a5e27ad0be046fc820a5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable
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 2244de273d2c..44b6d9b42483 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 | ||