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

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

Russell King 15 years ago

parent

35c44933ef 1252fa3154

commit

4bddaf6609

1 changed files with 0 additions and 2 deletions

Split View Show Diff Stats

						
							+ 0
							
							- 2
						
arch/arm/kernel/pmu.c
							 
								View File
							
				@@ -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
			
				 };