summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2014-03-24 16:06:42 -0500
committerRob Herring <robh@kernel.org>2014-05-20 14:24:40 -0500
commit735e0da7fc55a0456476f6b40f85024f68f87092 (patch)
tree41e26b8d24835851261c9b9b49fc334e232cd13b
parent6e87b7030e3ef2c7ad01fcaa1b46d3ebe6c261e7 (diff)
downloadlinux-735e0da7fc55a0456476f6b40f85024f68f87092.tar.bz2
irqchip: align irqchip OF match table section naming
Make the irqchip OF match table section naming aligned with other OF match table sections in preparation to have a common definition. Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Rob Herring <robh@kernel.org>
-rw-r--r--drivers/irqchip/irqchip.c6
-rw-r--r--include/asm-generic/vmlinux.lds.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/irqchip/irqchip.c b/drivers/irqchip/irqchip.c
index cad3e2495552..0fe2f718d81c 100644
--- a/drivers/irqchip/irqchip.c
+++ b/drivers/irqchip/irqchip.c
@@ -19,11 +19,11 @@
* special section.
*/
static const struct of_device_id
-irqchip_of_match_end __used __section(__irqchip_of_end);
+irqchip_of_match_end __used __section(__irqchip_of_table_end);
-extern struct of_device_id __irqchip_begin[];
+extern struct of_device_id __irqchip_of_table[];
void __init irqchip_init(void)
{
- of_irq_init(__irqchip_begin);
+ of_irq_init(__irqchip_of_table);
}
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 146e4fffd710..b1c6f9d0c4ff 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -151,9 +151,9 @@
#ifdef CONFIG_IRQCHIP
#define IRQCHIP_OF_MATCH_TABLE() \
. = ALIGN(8); \
- VMLINUX_SYMBOL(__irqchip_begin) = .; \
+ VMLINUX_SYMBOL(__irqchip_of_table) = .; \
*(__irqchip_of_table) \
- *(__irqchip_of_end)
+ *(__irqchip_of_table_end)
#else
#define IRQCHIP_OF_MATCH_TABLE()
#endif