From d199f8694e99e82377dd6b09c3f25c0743972e02 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Fri, 25 Jan 2013 21:29:41 +0800
Subject: [PATCH] --- yaml --- r: 349331 b: refs/heads/master c:
 d4cbca9ef822e05d4b55e7d0f1cdfded7a472a56 h: refs/heads/master i:   349329:
 0c47ce294ab732e656ce549c2de63dea0a07e57c   349327:
 9efc89840d2d24e0f21237306449ef4e2fafd667 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/regulator/dbx500-prcmu.c       | 1 -
 trunk/drivers/regulator/tps80031-regulator.c | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3e75cd79ec27..7ebf0e28c0c8 100644
--- 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
index 89bd2faaef8c..261f3d2299bc 100644
--- 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
index b15d711bc8c6..9019d0e7ecb6 100644
--- 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);