Skip to content

Commit

Permalink
Merge branch 'for-russell' of git://codeaurora.org/quic/kernel/dwalke…
Browse files Browse the repository at this point in the history
…r/linux-msm into devel-stable
  • Loading branch information
Russell King committed May 7, 2010
2 parents 35c4493 + 1252fa3 commit 4bddaf6
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions arch/arm/kernel/pmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
};

Expand Down

0 comments on commit 4bddaf6

Please sign in to comment.