From 6ad95b49202fbc2c00e5373bf47f08faef36bb12 Mon Sep 17 00:00:00 2001 From: Daniel Walker Date: Fri, 1 Jan 2010 14:52:30 -0800 Subject: [PATCH] --- yaml --- r: 191844 b: refs/heads/master c: ee3c454b8da04815c1884ed85fe89d2d131c0e51 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/pmu.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 74bd73d364ff..4b9e4cd3210e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b536b8d909f4e3dfa84fa7a63fbc5896e3490e8 +refs/heads/master: ee3c454b8da04815c1884ed85fe89d2d131c0e51 diff --git a/trunk/arch/arm/kernel/pmu.c b/trunk/arch/arm/kernel/pmu.c index a124312e343f..4f0eb4c2a72c 100644 --- a/trunk/arch/arm/kernel/pmu.c +++ b/trunk/arch/arm/kernel/pmu.c @@ -44,6 +44,8 @@ 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 };