summaryrefslogtreecommitdiff
path: root/drivers/irqchip/irqchip.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/irqchip/irqchip.c')
-rw-r--r--drivers/irqchip/irqchip.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/irqchip/irqchip.c b/drivers/irqchip/irqchip.c
index afd1af3dfe5a..1ee773e98f5f 100644
--- a/drivers/irqchip/irqchip.c
+++ b/drivers/irqchip/irqchip.c
@@ -8,7 +8,7 @@
* warranty of any kind, whether express or implied.
*/
-#include <linux/acpi_irq.h>
+#include <linux/acpi.h>
#include <linux/init.h>
#include <linux/of_irq.h>
#include <linux/irqchip.h>
@@ -27,6 +27,8 @@ extern struct of_device_id __irqchip_of_table[];
void __init irqchip_init(void)
{
of_irq_init(__irqchip_of_table);
-
- acpi_irq_init();
+#if defined(CONFIG_ARM64) && defined(CONFIG_ACPI)
+ acpi_gic_init(); /* Temporary hack */
+#endif
+ acpi_probe_device_table(irqchip);
}