---

yaml --- r: 309393 b: refs/heads/master c: fb55140 h: refs/heads/master i: 309391: 0b964b9 v: v3
git-mirror · May 30, 2012 · 4d0af99 · 4d0af99
1 parent 2dc3d32
commit 4d0af99
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 317 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e907df32725204d6d2cb79b872529911c8eadcdf
+refs/heads/master: fb551405c0f8e15d6fc7ae6e16a5e15382f8b8ac
diff --git a/trunk/drivers/hwmon/sch5627.c b/trunk/drivers/hwmon/sch5627.c
@@ -579,7 +579,7 @@ static int __devinit sch5627_probe(struct platform_device *pdev)
 	}
 
 	/* Note failing to register the watchdog is not a fatal error */
-	data->watchdog = sch56xx_watchdog_register(data->addr,
+	data->watchdog = sch56xx_watchdog_register(&pdev->dev, data->addr,
 			(build_code << 24) | (build_id << 8) | hwmon_rev,
 			&data->update_lock, 1);
 

diff --git a/trunk/drivers/hwmon/sch5636.c b/trunk/drivers/hwmon/sch5636.c
@@ -510,7 +510,7 @@ static int __devinit sch5636_probe(struct platform_device *pdev)
 	}
 
 	/* Note failing to register the watchdog is not a fatal error */
-	data->watchdog = sch56xx_watchdog_register(data->addr,
+	data->watchdog = sch56xx_watchdog_register(&pdev->dev, data->addr,
 					(revision[0] << 8) | revision[1],
 					&data->update_lock, 0);