edac: core fix to use dynamic kobject

[linux-2.6-omap-h63xx.git] / drivers / watchdog / mpc5200_wdt.c

diff --git a/drivers/watchdog/mpc5200_wdt.c b/drivers/watchdog/mpc5200_wdt.c
index 9cfb9757662361cb64b770764aa1fa66a4be29f8..77c1c2ae2cc2499f91928c6b3d69ddf34663f71b 100644 (file)
--- a/drivers/watchdog/mpc5200_wdt.c
+++ b/drivers/watchdog/mpc5200_wdt.c
@@ -4,7 +4,7 @@
 #include <linux/watchdog.h>
 #include <linux/io.h>
 #include <linux/spinlock.h>
-#include <asm/of_platform.h>
+#include <linux/of_platform.h>
 #include <asm/uaccess.h>
 #include <asm/mpc52xx.h>
 
@@ -158,7 +158,7 @@ static int mpc5200_wdt_release(struct inode *inode, struct file *file)
        return 0;
 }
 
-static struct file_operations mpc5200_wdt_fops = {
+static const struct file_operations mpc5200_wdt_fops = {
        .owner  = THIS_MODULE,
        .write  = mpc5200_wdt_write,
        .ioctl  = mpc5200_wdt_ioctl,
@@ -175,6 +175,8 @@ static int mpc5200_wdt_probe(struct of_device *op, const struct of_device_id *ma
        int size;
 
        has_wdt = of_get_property(op->node, "has-wdt", NULL);
+       if (!has_wdt)
+               has_wdt = of_get_property(op->node, "fsl,has-wdt", NULL);
        if (!has_wdt)
                return -ENODEV;
 
@@ -254,6 +256,7 @@ static int mpc5200_wdt_shutdown(struct of_device *op)
 
 static struct of_device_id mpc5200_wdt_match[] = {
        { .compatible = "mpc5200-gpt", },
+       { .compatible = "fsl,mpc5200-gpt", },
        {},
 };
 static struct of_platform_driver mpc5200_wdt_driver = {