aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/hardirq.h
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-07-17 18:34:04 +0100
committerMark Brown <broonie@linaro.org>2013-07-17 18:34:04 +0100
commit20ce13dacdefe4d429217e710bf5461a4c6d1cf9 (patch)
tree3fc24c16594a2329ad190438586ce709e6c94746 /arch/arm/include/asm/hardirq.h
parent8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff)
parent8e3aa3f1462fc25b810e867059b292675f0d3a94 (diff)
downloadvexpress-lsk-v3.10/topic/iks.tar.gz
Merge branch 'iks' of git://git.linaro.org/people/nico/linux into lsk-v3.10-iksv3.10/topic/ikstopic/v3.10/iks
Diffstat (limited to 'arch/arm/include/asm/hardirq.h')
-rw-r--r--arch/arm/include/asm/hardirq.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/hardirq.h b/arch/arm/include/asm/hardirq.h
index 2740c2a2df6..3d7351c844a 100644
--- a/arch/arm/include/asm/hardirq.h
+++ b/arch/arm/include/asm/hardirq.h
@@ -5,7 +5,7 @@
#include <linux/threads.h>
#include <asm/irq.h>
-#define NR_IPI 6
+#define NR_IPI 7
typedef struct {
unsigned int __softirq_pending;