Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / arch / powerpc / sysdev / fsl_gtm.c

diff --git a/arch/powerpc/sysdev/fsl_gtm.c b/arch/powerpc/sysdev/fsl_gtm.c
index 0eb871cc3437f9250372422f727f112a18f6b002..06ac3c61b3d0fa2568c8d6b081bbaf57fd8f9ff8 100644 (file)
--- a/arch/powerpc/sysdev/fsl_gtm.c
+++ b/arch/powerpc/sysdev/fsl_gtm.c
@@ -19,6 +19,8 @@
 #include <linux/list.h>
 #include <linux/io.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 #include <linux/spinlock.h>
 #include <linux/bitops.h>
 #include <linux/slab.h>
@@ -401,16 +403,15 @@ static int __init fsl_gtm_init(void)
                gtm->clock = *clock;
 
                for (i = 0; i < ARRAY_SIZE(gtm->timers); i++) {
-                       int ret;
-                       struct resource irq;
+                       unsigned int irq;
 
-                       ret = of_irq_to_resource(np, i, &irq);
-                       if (ret == NO_IRQ) {
+                       irq = irq_of_parse_and_map(np, i);
+                       if (irq == NO_IRQ) {
                                pr_err("%s: not enough interrupts specified\n",
                                       np->full_name);
                                goto err;
                        }
-                       gtm->timers[i].irq = irq.start;
+                       gtm->timers[i].irq = irq;
                        gtm->timers[i].gtm = gtm;
                }