diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2013-01-24 07:03:36 -0500 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2013-01-24 07:03:36 -0500 |
| commit | 369e67595ad8f278edf32a65f10ba473baeff03e (patch) | |
| tree | a3bba5b97c6bb522343cf16a216047e9ca99d90c /drivers/irqchip/spear-shirq.c | |
| parent | a749474de5f0f5902f59acb5c7f4dc6b816ac788 (diff) | |
| parent | 9e47b8bf9815523a5816f2f83e73b13812d74014 (diff) | |
Merge remote-tracking branch 'arm-soc/irqchip/gic-vic-move' into kvm-arm/vgic
Diffstat (limited to 'drivers/irqchip/spear-shirq.c')
| -rw-r--r-- | drivers/irqchip/spear-shirq.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/irqchip/spear-shirq.c b/drivers/irqchip/spear-shirq.c index 80e1d2fd9d4c..8527743b5cef 100644 --- a/drivers/irqchip/spear-shirq.c +++ b/drivers/irqchip/spear-shirq.c | |||
| @@ -25,6 +25,8 @@ | |||
| 25 | #include <linux/of_irq.h> | 25 | #include <linux/of_irq.h> |
| 26 | #include <linux/spinlock.h> | 26 | #include <linux/spinlock.h> |
| 27 | 27 | ||
| 28 | #include "irqchip.h" | ||
| 29 | |||
| 28 | static DEFINE_SPINLOCK(lock); | 30 | static DEFINE_SPINLOCK(lock); |
| 29 | 31 | ||
| 30 | /* spear300 shared irq registers offsets and masks */ | 32 | /* spear300 shared irq registers offsets and masks */ |
| @@ -300,6 +302,7 @@ int __init spear300_shirq_of_init(struct device_node *np, | |||
| 300 | return shirq_init(spear300_shirq_blocks, | 302 | return shirq_init(spear300_shirq_blocks, |
| 301 | ARRAY_SIZE(spear300_shirq_blocks), np); | 303 | ARRAY_SIZE(spear300_shirq_blocks), np); |
| 302 | } | 304 | } |
| 305 | IRQCHIP_DECLARE(spear300_shirq, "st,spear300-shirq", spear300_shirq_of_init); | ||
| 303 | 306 | ||
| 304 | int __init spear310_shirq_of_init(struct device_node *np, | 307 | int __init spear310_shirq_of_init(struct device_node *np, |
| 305 | struct device_node *parent) | 308 | struct device_node *parent) |
| @@ -307,6 +310,7 @@ int __init spear310_shirq_of_init(struct device_node *np, | |||
| 307 | return shirq_init(spear310_shirq_blocks, | 310 | return shirq_init(spear310_shirq_blocks, |
| 308 | ARRAY_SIZE(spear310_shirq_blocks), np); | 311 | ARRAY_SIZE(spear310_shirq_blocks), np); |
| 309 | } | 312 | } |
| 313 | IRQCHIP_DECLARE(spear310_shirq, "st,spear310-shirq", spear310_shirq_of_init); | ||
| 310 | 314 | ||
| 311 | int __init spear320_shirq_of_init(struct device_node *np, | 315 | int __init spear320_shirq_of_init(struct device_node *np, |
| 312 | struct device_node *parent) | 316 | struct device_node *parent) |
| @@ -314,3 +318,4 @@ int __init spear320_shirq_of_init(struct device_node *np, | |||
| 314 | return shirq_init(spear320_shirq_blocks, | 318 | return shirq_init(spear320_shirq_blocks, |
| 315 | ARRAY_SIZE(spear320_shirq_blocks), np); | 319 | ARRAY_SIZE(spear320_shirq_blocks), np); |
| 316 | } | 320 | } |
| 321 | IRQCHIP_DECLARE(spear320_shirq, "st,spear320-shirq", spear320_shirq_of_init); | ||
