diff options
author | Rob Herring <rob.herring@calxeda.com> | 2012-01-17 14:10:25 -0500 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2012-01-25 21:37:48 -0500 |
commit | 0f55239348aa85021d8bf8b63d84a796fcc142a4 (patch) | |
tree | 264dab6d2ffc1d05a634a384be6cd91379d32637 /drivers | |
parent | 7f1e76370b717be264f0af54719182a96fb8f36d (diff) |
sh: intc: remove dependency on NR_IRQS
SH intc has a compile time dependency on NR_IRQS. Make this dependency a
local define so that shmobile (and ARM in general) can have run-time
NR_IRQS setting.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/sh/intc/balancing.c | 2 | ||||
-rw-r--r-- | drivers/sh/intc/core.c | 2 | ||||
-rw-r--r-- | drivers/sh/intc/handle.c | 2 | ||||
-rw-r--r-- | drivers/sh/intc/virq.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/sh/intc/balancing.c b/drivers/sh/intc/balancing.c index cec7a96f2c09..bc780807ccb0 100644 --- a/drivers/sh/intc/balancing.c +++ b/drivers/sh/intc/balancing.c | |||
@@ -9,7 +9,7 @@ | |||
9 | */ | 9 | */ |
10 | #include "internals.h" | 10 | #include "internals.h" |
11 | 11 | ||
12 | static unsigned long dist_handle[NR_IRQS]; | 12 | static unsigned long dist_handle[INTC_NR_IRQS]; |
13 | 13 | ||
14 | void intc_balancing_enable(unsigned int irq) | 14 | void intc_balancing_enable(unsigned int irq) |
15 | { | 15 | { |
diff --git a/drivers/sh/intc/core.c b/drivers/sh/intc/core.c index e53e449b4eca..2fde8970dfd0 100644 --- a/drivers/sh/intc/core.c +++ b/drivers/sh/intc/core.c | |||
@@ -42,7 +42,7 @@ unsigned int nr_intc_controllers; | |||
42 | * - this needs to be at least 2 for 5-bit priorities on 7780 | 42 | * - this needs to be at least 2 for 5-bit priorities on 7780 |
43 | */ | 43 | */ |
44 | static unsigned int default_prio_level = 2; /* 2 - 16 */ | 44 | static unsigned int default_prio_level = 2; /* 2 - 16 */ |
45 | static unsigned int intc_prio_level[NR_IRQS]; /* for now */ | 45 | static unsigned int intc_prio_level[INTC_NR_IRQS]; /* for now */ |
46 | 46 | ||
47 | unsigned int intc_get_dfl_prio_level(void) | 47 | unsigned int intc_get_dfl_prio_level(void) |
48 | { | 48 | { |
diff --git a/drivers/sh/intc/handle.c b/drivers/sh/intc/handle.c index 057ce56829bf..f461d5300b81 100644 --- a/drivers/sh/intc/handle.c +++ b/drivers/sh/intc/handle.c | |||
@@ -13,7 +13,7 @@ | |||
13 | #include <linux/spinlock.h> | 13 | #include <linux/spinlock.h> |
14 | #include "internals.h" | 14 | #include "internals.h" |
15 | 15 | ||
16 | static unsigned long ack_handle[NR_IRQS]; | 16 | static unsigned long ack_handle[INTC_NR_IRQS]; |
17 | 17 | ||
18 | static intc_enum __init intc_grp_id(struct intc_desc *desc, | 18 | static intc_enum __init intc_grp_id(struct intc_desc *desc, |
19 | intc_enum enum_id) | 19 | intc_enum enum_id) |
diff --git a/drivers/sh/intc/virq.c b/drivers/sh/intc/virq.c index c7ec49ffd9f6..93cec21e788b 100644 --- a/drivers/sh/intc/virq.c +++ b/drivers/sh/intc/virq.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <linux/export.h> | 17 | #include <linux/export.h> |
18 | #include "internals.h" | 18 | #include "internals.h" |
19 | 19 | ||
20 | static struct intc_map_entry intc_irq_xlate[NR_IRQS]; | 20 | static struct intc_map_entry intc_irq_xlate[INTC_NR_IRQS]; |
21 | 21 | ||
22 | struct intc_virq_list { | 22 | struct intc_virq_list { |
23 | unsigned int irq; | 23 | unsigned int irq; |