From 3412793bd06b1838855d134f302adb5584ff450a Mon Sep 17 00:00:00 2001
From: Leo Chen <leochen@broadcom.com>
Date: Thu, 15 Oct 2009 22:45:41 +0100
Subject: [PATCH] --- yaml --- r: 167813 b: refs/heads/master c:
 8c5b0f9a85cd78e98123417a8e9d58857968ff13 h: refs/heads/master i:   167811:
 a74f38c75b4473ead91e7f6e40a065d02756065e v: v3

---
 [refs]                                | 2 +-
 trunk/arch/arm/oprofile/op_model_v6.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index eab98783a78c..e534e6725b9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50ad5f591bf0d2c877cb3689be01bea9eefdeb2b
+refs/heads/master: 8c5b0f9a85cd78e98123417a8e9d58857968ff13
diff --git a/trunk/arch/arm/oprofile/op_model_v6.c b/trunk/arch/arm/oprofile/op_model_v6.c
index fe581383d3e2..f7d2ec5ee9a1 100644
--- a/trunk/arch/arm/oprofile/op_model_v6.c
+++ b/trunk/arch/arm/oprofile/op_model_v6.c
@@ -33,6 +33,9 @@ static int irqs[] = {
 #ifdef CONFIG_ARCH_OMAP2
 	3,
 #endif
+#ifdef CONFIG_ARCH_BCMRING
+	IRQ_PMUIRQ, /* for BCMRING, ARM PMU interrupt is 43 */
+#endif
 };
 
 static void armv6_pmu_stop(void)