diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-22 13:42:54 -0500 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-22 13:42:54 -0500 |
| commit | 1eb42c73ca0a3692fb928e9f125cf84544ad5f12 (patch) | |
| tree | b6e022f3e44db3599949805a64b1847cd29e771a /arch/arm/kernel/perf_event_v6.c | |
| parent | d00a78d9409bee2e3bb7174a1810c0a655b4eaf4 (diff) | |
| parent | 3ba6e69ad887f8a814267ed36fd4bfbddf8855a9 (diff) | |
Merge commit '3ba6e69' (v6v7 branch) into linaro-2.6.38
Conflicts:
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/kernel/perf_event_v6.c')
| -rw-r--r-- | arch/arm/kernel/perf_event_v6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/perf_event_v6.c b/arch/arm/kernel/perf_event_v6.c index c058bfc8532..6fc2d228db5 100644 --- a/arch/arm/kernel/perf_event_v6.c +++ b/arch/arm/kernel/perf_event_v6.c @@ -30,7 +30,7 @@ * enable the interrupt. */ -#ifdef CONFIG_CPU_V6 +#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) enum armv6_perf_types { ARMV6_PERFCTR_ICACHE_MISS = 0x0, ARMV6_PERFCTR_IBUF_STALL = 0x1, @@ -669,4 +669,4 @@ static const struct arm_pmu *__init armv6mpcore_pmu_init(void) { return NULL; } -#endif /* CONFIG_CPU_V6 */ +#endif /* CONFIG_CPU_V6 || CONFIG_CPU_V6K */ |