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

[deliverable/linux.git] / drivers / watchdog / cpwd.c

diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c
index 3de4ba0260a50f482a12d0869b35287592cd4ff0..65911678453d0633f21afe611d21cb693cb07bb9 100644 (file)
--- a/drivers/watchdog/cpwd.c
+++ b/drivers/watchdog/cpwd.c
@@ -528,8 +528,7 @@ static const struct file_operations cpwd_fops = {
        .llseek =               no_llseek,
 };
 
-static int __devinit cpwd_probe(struct platform_device *op,
-                               const struct of_device_id *match)
+static int __devinit cpwd_probe(struct platform_device *op)
 {
        struct device_node *options;
        const char *str_prop;
@@ -678,7 +677,7 @@ static const struct of_device_id cpwd_match[] = {
 };
 MODULE_DEVICE_TABLE(of, cpwd_match);
 
-static struct of_platform_driver cpwd_driver = {
+static struct platform_driver cpwd_driver = {
        .driver = {
                .name = DRIVER_NAME,
                .owner = THIS_MODULE,
@@ -690,12 +689,12 @@ static struct of_platform_driver cpwd_driver = {
 
 static int __init cpwd_init(void)
 {
-       return of_register_platform_driver(&cpwd_driver);
+       return platform_driver_register(&cpwd_driver);
 }
 
 static void __exit cpwd_exit(void)
 {
-       of_unregister_platform_driver(&cpwd_driver);
+       platform_driver_unregister(&cpwd_driver);
 }
 
 module_init(cpwd_init);