Merge branch 'irqdomain/next' of git://git.secretlab.ca/git/linux-2.6

[~andy/linux] / arch / arm / mach-versatile / core.c

diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index 4f352e45be0a0516cdd72d5612211097014beb85..0968772aedbe1bfac8f9438c759dfb65bb0c29b0 100644 (file)
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -98,8 +98,11 @@ static const struct of_device_id sic_of_match[] __initconst = {
 
 void __init versatile_init_irq(void)
 {
-       vic_init(VA_VIC_BASE, IRQ_VIC_START, ~0, 0);
-       irq_domain_generate_simple(vic_of_match, VERSATILE_VIC_BASE, IRQ_VIC_START);
+       struct device_node *np;
+
+       np = of_find_matching_node_by_address(NULL, vic_of_match,
+                                             VERSATILE_VIC_BASE);
+       __vic_init(VA_VIC_BASE, IRQ_VIC_START, ~0, 0, np);
 
        writel(~0, VA_SIC_BASE + SIC_IRQ_ENABLE_CLEAR);