Merge branch 'params' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux...

[sfrench/cifs-2.6.git] / drivers / watchdog / gef_wdt.c

diff --git a/drivers/watchdog/gef_wdt.c b/drivers/watchdog/gef_wdt.c
index ca0f4c6cf5ab98217f1b444a94611b0098781041..9c21d19043a63980372d032ceee5d2933e3a591f 100644 (file)
--- a/drivers/watchdog/gef_wdt.c
+++ b/drivers/watchdog/gef_wdt.c
@@ -260,7 +260,7 @@ static struct miscdevice gef_wdt_miscdev = {
 };
 
 
-static int __devinit gef_wdt_probe(struct of_device *dev,
+static int __devinit gef_wdt_probe(struct platform_device *dev,
        const struct of_device_id *match)
 {
        int timeout = 10;
@@ -273,7 +273,7 @@ static int __devinit gef_wdt_probe(struct of_device *dev,
                bus_clk = freq;
 
        /* Map devices registers into memory */
-       gef_wdt_regs = of_iomap(dev->node, 0);
+       gef_wdt_regs = of_iomap(dev->dev.of_node, 0);
        if (gef_wdt_regs == NULL)
                return -ENOMEM;