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

This commit is contained in:
Russell King 2010-05-07 21:40:43 +01:00
commit 4bddaf6609
1 changed files with 0 additions and 2 deletions

View File

@ -44,8 +44,6 @@ static const int irqs[] = {
IRQ_IOP33X_CORE_PMU, IRQ_IOP33X_CORE_PMU,
#elif defined(CONFIG_ARCH_PXA) #elif defined(CONFIG_ARCH_PXA)
IRQ_PMU, IRQ_PMU,
#elif defined(CONFIG_ARCH_MSM_ARM11)
INT_ARM11_PMU,
#endif #endif
}; };