Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bddaf66 authored by Russell King's avatar Russell King
Browse files

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

parents 35c44933 1252fa31

arch/arm/kernel/pmu.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -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

};

};