diff options
author | Rob Herring <robh@kernel.org> | 2014-03-24 17:06:42 -0400 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2014-05-20 15:24:40 -0400 |
commit | 735e0da7fc55a0456476f6b40f85024f68f87092 (patch) | |
tree | 41e26b8d24835851261c9b9b49fc334e232cd13b | |
parent | 6e87b7030e3ef2c7ad01fcaa1b46d3ebe6c261e7 (diff) |
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.c | 6 | ||||
-rw-r--r-- | include/asm-generic/vmlinux.lds.h | 4 |
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 @@ | |||
19 | * special section. | 19 | * special section. |
20 | */ | 20 | */ |
21 | static const struct of_device_id | 21 | static const struct of_device_id |
22 | irqchip_of_match_end __used __section(__irqchip_of_end); | 22 | irqchip_of_match_end __used __section(__irqchip_of_table_end); |
23 | 23 | ||
24 | extern struct of_device_id __irqchip_begin[]; | 24 | extern struct of_device_id __irqchip_of_table[]; |
25 | 25 | ||
26 | void __init irqchip_init(void) | 26 | void __init irqchip_init(void) |
27 | { | 27 | { |
28 | of_irq_init(__irqchip_begin); | 28 | of_irq_init(__irqchip_of_table); |
29 | } | 29 | } |
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 @@ | |||
151 | #ifdef CONFIG_IRQCHIP | 151 | #ifdef CONFIG_IRQCHIP |
152 | #define IRQCHIP_OF_MATCH_TABLE() \ | 152 | #define IRQCHIP_OF_MATCH_TABLE() \ |
153 | . = ALIGN(8); \ | 153 | . = ALIGN(8); \ |
154 | VMLINUX_SYMBOL(__irqchip_begin) = .; \ | 154 | VMLINUX_SYMBOL(__irqchip_of_table) = .; \ |
155 | *(__irqchip_of_table) \ | 155 | *(__irqchip_of_table) \ |
156 | *(__irqchip_of_end) | 156 | *(__irqchip_of_table_end) |
157 | #else | 157 | #else |
158 | #define IRQCHIP_OF_MATCH_TABLE() | 158 | #define IRQCHIP_OF_MATCH_TABLE() |
159 | #endif | 159 | #endif |