diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-09 11:37:00 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-09 11:37:00 +0000 |
| commit | eed4bafd63b5584adb832a582a931ecba41dec55 (patch) | |
| tree | 5855807caaf53aec80037b2635eb2e2c0744565b /arch/arm/include/asm/hardirq.h | |
| parent | 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff) | |
| parent | 2c06cb20454795a38876be5bd93dd6a8ddcc9d98 (diff) | |
Merge branch 'android-3.10' of https://android.googlesource.com/kernel/common into lsk-v3.10-aosp
Diffstat (limited to 'arch/arm/include/asm/hardirq.h')
| -rw-r--r-- | arch/arm/include/asm/hardirq.h | 2 |
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; |