diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2015-06-26 14:42:45 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2015-06-30 18:03:57 +0200 |
| commit | 48a9b733e644ab4cc8e2a98950a36ddb12b8c54e (patch) | |
| tree | 502b0e3584f52d387e0a70f2992bed1da88660ed /drivers/of/irq.c | |
| parent | of/irq: Fix pSeries boot failure (diff) | |
| download | linux-48a9b733e644ab4cc8e2a98950a36ddb12b8c54e.tar.xz linux-48a9b733e644ab4cc8e2a98950a36ddb12b8c54e.zip | |
of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh
Now CONFIG_OF can be enabled on sh:
drivers/of/irq.c:472:8: error: redefinition of 'struct intc_desc'
include/linux/sh_intc.h:109:8: note: originally defined here
As "intc_desc" is used all over the place in sh platform code, while
drivers/of/irq.c has a local definition used in a single function,
rename the latter by prefixing it with "of_".
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/of/irq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/of/irq.c b/drivers/of/irq.c index cb4b9aeaa10d..3cf7a01f557f 100644 --- a/drivers/of/irq.c +++ b/drivers/of/irq.c @@ -468,7 +468,7 @@ int of_irq_to_resource_table(struct device_node *dev, struct resource *res, } EXPORT_SYMBOL_GPL(of_irq_to_resource_table); -struct intc_desc { +struct of_intc_desc { struct list_head list; struct device_node *dev; struct device_node *interrupt_parent; @@ -484,7 +484,7 @@ struct intc_desc { void __init of_irq_init(const struct of_device_id *matches) { struct device_node *np, *parent = NULL; - struct intc_desc *desc, *temp_desc; + struct of_intc_desc *desc, *temp_desc; struct list_head intc_desc_list, intc_parent_list; INIT_LIST_HEAD(&intc_desc_list); @@ -495,7 +495,7 @@ void __init of_irq_init(const struct of_device_id *matches) !of_device_is_available(np)) continue; /* - * Here, we allocate and populate an intc_desc with the node + * Here, we allocate and populate an of_intc_desc with the node * pointer, interrupt-parent device_node etc. */ desc = kzalloc(sizeof(*desc), GFP_KERNEL); |