aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMagnus Damm <damm@igel.co.jp>2007-08-16 11:45:35 -0400
committerPaul Mundt <lethal@linux-sh.org>2007-09-20 22:57:50 -0400
commit5c37e025352b993d8726b0207ff2270b2f2bc7d6 (patch)
tree87463d1c79600c37d3df06cbdbdf14bdc6de5094 /include
parent46420e49c9fd76defecfb3f048ab20c5a72dfd0a (diff)
sh: intc - mark data structures as __initdata
With the intc core improved it is now possible to put the intc data structures in the initdata section. Version two of this patch puts the __initdata inside DECLARE_INTC_DESC() and removes the __initdata included in the board specific r2d code. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include')
-rw-r--r--include/asm-sh/hw_irq.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-sh/hw_irq.h b/include/asm-sh/hw_irq.h
index 0e6a60304974..0c016e949931 100644
--- a/include/asm-sh/hw_irq.h
+++ b/include/asm-sh/hw_irq.h
@@ -42,10 +42,10 @@ struct intc_prio {
42 42
43struct intc_group { 43struct intc_group {
44 intc_enum enum_id; 44 intc_enum enum_id;
45 intc_enum *enum_ids; 45 intc_enum enum_ids[32];
46}; 46};
47 47
48#define INTC_GROUP(enum_id, ids...) { enum_id, (intc_enum []) { ids, 0 } } 48#define INTC_GROUP(enum_id, ids...) { enum_id, { ids } }
49 49
50struct intc_mask_reg { 50struct intc_mask_reg {
51 unsigned long set_reg, clr_reg, reg_width; 51 unsigned long set_reg, clr_reg, reg_width;
@@ -81,7 +81,7 @@ struct intc_desc {
81#define _INTC_ARRAY(a) a, sizeof(a)/sizeof(*a) 81#define _INTC_ARRAY(a) a, sizeof(a)/sizeof(*a)
82#define DECLARE_INTC_DESC(symbol, chipname, vectors, groups, \ 82#define DECLARE_INTC_DESC(symbol, chipname, vectors, groups, \
83 priorities, mask_regs, prio_regs, sense_regs) \ 83 priorities, mask_regs, prio_regs, sense_regs) \
84struct intc_desc symbol = { \ 84struct intc_desc symbol __initdata = { \
85 _INTC_ARRAY(vectors), _INTC_ARRAY(groups), \ 85 _INTC_ARRAY(vectors), _INTC_ARRAY(groups), \
86 _INTC_ARRAY(priorities), \ 86 _INTC_ARRAY(priorities), \
87 _INTC_ARRAY(mask_regs), _INTC_ARRAY(prio_regs), \ 87 _INTC_ARRAY(mask_regs), _INTC_ARRAY(prio_regs), \