diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-07 16:40:43 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-07 16:40:43 -0400 |
| commit | 4bddaf66093ce0e0c1fce505f091f4cd52e73e2e (patch) | |
| tree | ba4645ad436900156856c41455b5a6ab578fbb73 /arch/arm/kernel | |
| parent | 35c44933ef10ff4e47c9b28a7e61e648edd38845 (diff) | |
| parent | 1252fa3154fae1f9624ea40cbbf0ea5e21319013 (diff) | |
Merge branch 'for-russell' of git://codeaurora.org/quic/kernel/dwalker/linux-msm into devel-stable
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/pmu.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/kernel/pmu.c b/arch/arm/kernel/pmu.c index 4f0eb4c2a72c..a124312e343f 100644 --- a/arch/arm/kernel/pmu.c +++ b/arch/arm/kernel/pmu.c | |||
| @@ -44,8 +44,6 @@ static const int irqs[] = { | |||
| 44 | IRQ_IOP33X_CORE_PMU, | 44 | IRQ_IOP33X_CORE_PMU, |
| 45 | #elif defined(CONFIG_ARCH_PXA) | 45 | #elif defined(CONFIG_ARCH_PXA) |
| 46 | IRQ_PMU, | 46 | IRQ_PMU, |
| 47 | #elif defined(CONFIG_ARCH_MSM_ARM11) | ||
| 48 | INT_ARM11_PMU, | ||
| 49 | #endif | 47 | #endif |
| 50 | }; | 48 | }; |
| 51 | 49 | ||