summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/riowd.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-08-18 15:17:52 +0200
committerTakashi Iwai <tiwai@suse.de>2010-08-18 15:17:52 +0200
commite7cfbea9cb7a02ea29fdae5d39c9e3d09102c4d5 (patch)
tree37c20ec03e70dc7b5df1d02f16b6ac38d8ed1364 /drivers/watchdog/riowd.c
parent7ac03db84baa204d7d280401ed65842541ed1078 (diff)
parent56385a12d9bb9e173751f74b6c430742018cafc0 (diff)
downloadlinux-e7cfbea9cb7a02ea29fdae5d39c9e3d09102c4d5.tar.gz
linux-e7cfbea9cb7a02ea29fdae5d39c9e3d09102c4d5.tar.bz2
linux-e7cfbea9cb7a02ea29fdae5d39c9e3d09102c4d5.zip
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'drivers/watchdog/riowd.c')
-rw-r--r--drivers/watchdog/riowd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/riowd.c b/drivers/watchdog/riowd.c
index 4082b4ace1fc..3faee1ae64bd 100644
--- a/drivers/watchdog/riowd.c
+++ b/drivers/watchdog/riowd.c
@@ -172,7 +172,7 @@ static struct miscdevice riowd_miscdev = {
.fops = &riowd_fops
};
-static int __devinit riowd_probe(struct of_device *op,
+static int __devinit riowd_probe(struct platform_device *op,
const struct of_device_id *match)
{
struct riowd *p;
@@ -219,7 +219,7 @@ out:
return err;
}
-static int __devexit riowd_remove(struct of_device *op)
+static int __devexit riowd_remove(struct platform_device *op)
{
struct riowd *p = dev_get_drvdata(&op->dev);