Merge branch 'master' into for-linus

[pandora-kernel.git] / arch / arm / include / asm / hardirq.h

diff --git a/arch/arm/include/asm/hardirq.h b/arch/arm/include/asm/hardirq.h
index 182310b..6d7485a 100644 (file)
--- a/arch/arm/include/asm/hardirq.h
+++ b/arch/arm/include/asm/hardirq.h
@@ -12,7 +12,9 @@ typedef struct {
 
 #include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */
 
-#if NR_IRQS > 256
+#if NR_IRQS > 512
+#define HARDIRQ_BITS   10
+#elif NR_IRQS > 256
 #define HARDIRQ_BITS   9
 #else
 #define HARDIRQ_BITS   8