---

yaml --- r: 349331 b: refs/heads/master c: d4cbca9 h: refs/heads/master i: 349329: 0c47ce2 349327: 9efc898 v: v3
git-mirror · Jan 26, 2013 · d199f86 · d199f86
1 parent 8ea44b5
commit d199f86
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c3a6aae5d09f7177ff781e6a7c6d53cbbe1d146
+refs/heads/master: d4cbca9ef822e05d4b55e7d0f1cdfded7a472a56
diff --git a/trunk/drivers/regulator/dbx500-prcmu.c b/trunk/drivers/regulator/dbx500-prcmu.c
@@ -14,7 +14,6 @@
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 
 #include "dbx500-prcmu.h"
 

diff --git a/trunk/drivers/regulator/tps80031-regulator.c b/trunk/drivers/regulator/tps80031-regulator.c
@@ -728,7 +728,7 @@ static int tps80031_regulator_probe(struct platform_device *pdev)
 			}
 		}
 		rdev = regulator_register(&ri->rinfo->desc, &config);
-		if (IS_ERR_OR_NULL(rdev)) {
+		if (IS_ERR(rdev)) {
 			dev_err(&pdev->dev,
 				"register regulator failed %s\n",
 					ri->rinfo->desc.name);