From eb199e5cc7f142024d47fda72cae171b8b607373 Mon Sep 17 00:00:00 2001
From: Rob Herring <rob.herring@calxeda.com>
Date: Tue, 17 Jan 2012 13:10:25 -0600
Subject: [PATCH] --- yaml --- r: 297616 b: refs/heads/master c:
 0f55239348aa85021d8bf8b63d84a796fcc142a4 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/sh/intc/balancing.c | 2 +-
 trunk/drivers/sh/intc/core.c      | 2 +-
 trunk/drivers/sh/intc/handle.c    | 2 +-
 trunk/drivers/sh/intc/virq.c      | 2 +-
 trunk/include/linux/sh_intc.h     | 6 ++++++
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 1d5dc7594066..49056d2613b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f1e76370b717be264f0af54719182a96fb8f36d
+refs/heads/master: 0f55239348aa85021d8bf8b63d84a796fcc142a4
diff --git a/trunk/drivers/sh/intc/balancing.c b/trunk/drivers/sh/intc/balancing.c
index cec7a96f2c09..bc780807ccb0 100644
--- a/trunk/drivers/sh/intc/balancing.c
+++ b/trunk/drivers/sh/intc/balancing.c
@@ -9,7 +9,7 @@
  */
 #include "internals.h"
 
-static unsigned long dist_handle[NR_IRQS];
+static unsigned long dist_handle[INTC_NR_IRQS];
 
 void intc_balancing_enable(unsigned int irq)
 {
diff --git a/trunk/drivers/sh/intc/core.c b/trunk/drivers/sh/intc/core.c
index e53e449b4eca..2fde8970dfd0 100644
--- a/trunk/drivers/sh/intc/core.c
+++ b/trunk/drivers/sh/intc/core.c
@@ -42,7 +42,7 @@ unsigned int nr_intc_controllers;
  * - this needs to be at least 2 for 5-bit priorities on 7780
  */
 static unsigned int default_prio_level = 2;	/* 2 - 16 */
-static unsigned int intc_prio_level[NR_IRQS];	/* for now */
+static unsigned int intc_prio_level[INTC_NR_IRQS];	/* for now */
 
 unsigned int intc_get_dfl_prio_level(void)
 {
diff --git a/trunk/drivers/sh/intc/handle.c b/trunk/drivers/sh/intc/handle.c
index 057ce56829bf..f461d5300b81 100644
--- a/trunk/drivers/sh/intc/handle.c
+++ b/trunk/drivers/sh/intc/handle.c
@@ -13,7 +13,7 @@
 #include <linux/spinlock.h>
 #include "internals.h"
 
-static unsigned long ack_handle[NR_IRQS];
+static unsigned long ack_handle[INTC_NR_IRQS];
 
 static intc_enum __init intc_grp_id(struct intc_desc *desc,
 				    intc_enum enum_id)
diff --git a/trunk/drivers/sh/intc/virq.c b/trunk/drivers/sh/intc/virq.c
index c7ec49ffd9f6..93cec21e788b 100644
--- a/trunk/drivers/sh/intc/virq.c
+++ b/trunk/drivers/sh/intc/virq.c
@@ -17,7 +17,7 @@
 #include <linux/export.h>
 #include "internals.h"
 
-static struct intc_map_entry intc_irq_xlate[NR_IRQS];
+static struct intc_map_entry intc_irq_xlate[INTC_NR_IRQS];
 
 struct intc_virq_list {
 	unsigned int irq;
diff --git a/trunk/include/linux/sh_intc.h b/trunk/include/linux/sh_intc.h
index e1a2ac5c931b..6aed0805927f 100644
--- a/trunk/include/linux/sh_intc.h
+++ b/trunk/include/linux/sh_intc.h
@@ -3,6 +3,12 @@
 
 #include <linux/ioport.h>
 
+#ifdef CONFIG_SUPERH
+#define INTC_NR_IRQS	512
+#else
+#define INTC_NR_IRQS	1024
+#endif
+
 /*
  * Convert back and forth between INTEVT and IRQ values.
  */