diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 17:59:47 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 17:59:47 +0300 |
| commit | 5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834 (patch) | |
| tree | 7b72b66081d042a41dc822575503133364857ce2 /arch/arm/oprofile/op_model_v6.c | |
| parent | e0ee98513d1a2e24d2ddbdecf4216bcca29d1158 (diff) | |
| parent | 6060e8df517847bf445ebc61de7d4d9c7faae990 (diff) | |
| download | linux-5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834.tar.xz | |
Merge branch 'pending-misc' (early part) into devel
Diffstat (limited to 'arch/arm/oprofile/op_model_v6.c')
| -rw-r--r-- | arch/arm/oprofile/op_model_v6.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/oprofile/op_model_v6.c b/arch/arm/oprofile/op_model_v6.c index fe581383d3e2..f7d2ec5ee9a1 100644 --- a/arch/arm/oprofile/op_model_v6.c +++ b/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) |