Merge branch 'linus' into perf/urgent

[cascardo/linux.git] / arch / powerpc / platforms / cell / celleb_scc_sio.c

diff --git a/arch/powerpc/platforms/cell/celleb_scc_sio.c b/arch/powerpc/platforms/cell/celleb_scc_sio.c
index 9c339ec..c8eb571 100644 (file)
--- a/arch/powerpc/platforms/cell/celleb_scc_sio.c
+++ b/arch/powerpc/platforms/cell/celleb_scc_sio.c
@@ -45,7 +45,7 @@ static int __init txx9_serial_init(void)
        struct device_node *node;
        int i;
        struct uart_port req;
-       struct of_irq irq;
+       struct of_phandle_args irq;
        struct resource res;
 
        for_each_compatible_node(node, "serial", "toshiba,sio-scc") {
@@ -53,7 +53,7 @@ static int __init txx9_serial_init(void)
                        if (!(txx9_serial_bitmap & (1<<i)))
                                continue;
 
-                       if (of_irq_map_one(node, i, &irq))
+                       if (of_irq_parse_one(node, i, &irq))
                                continue;
                        if (of_address_to_resource(node,
                                txx9_scc_tab[i].index, &res))
@@ -66,8 +66,7 @@ static int __init txx9_serial_init(void)
 #ifdef CONFIG_SERIAL_TXX9_CONSOLE
                        req.membase = ioremap(req.mapbase, 0x24);
 #endif
-                       req.irq = irq_create_of_mapping(irq.controller,
-                               irq.specifier, irq.size);
+                       req.irq = irq_create_of_mapping(&irq);
                        req.flags |= UPF_IOREMAP | UPF_BUGGY_UART
                                /*HAVE_CTS_LINE*/;
                        req.uartclk = 83300000;