Merge branch 'for-russell' of git://codeaurora.org/quic/kernel/dwalker/linux-msm...

diff --git a/arch/arm/kernel/pmu.c b/arch/arm/kernel/pmu.c
index 4f0eb4c2a72cf8b8dad6d772404a164dc661cf2a..a124312e343f1c50c550773b9a576ee2752189b2 100644 (file)
--- a/arch/arm/kernel/pmu.c
+++ b/arch/arm/kernel/pmu.c
@@ -44,8 +44,6 @@ static const int irqs[] = {
        IRQ_IOP33X_CORE_PMU,
 #elif defined(CONFIG_ARCH_PXA)
        IRQ_PMU,
-#elif defined(CONFIG_ARCH_MSM_ARM11)
-       INT_ARM11_PMU,
 #endif
 };