From b6ea48f980f881f90c6cb5d11d01166dd183a5aa Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Thu, 24 Mar 2011 13:30:59 -0700
Subject: [PATCH] --- yaml --- r: 242979 b: refs/heads/master c:
 5362b09849508db94a15f3f6996427aab248320a h: refs/heads/master i:   242977:
 95ee5f48e43a84ad001f10bd4a1cc39be1acf03b   242975:
 f0af1cb00257ecc77fed53a9f111ff8f29015294 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/regulator/tps6524x-regulator.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 312f431f9da5..733f5a72ccf0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69952369ed2367bae0ae207a6e380ed40cdbc414
+refs/heads/master: 5362b09849508db94a15f3f6996427aab248320a
diff --git a/trunk/drivers/regulator/tps6524x-regulator.c b/trunk/drivers/regulator/tps6524x-regulator.c
index 176a6be5a8ce..9166aa0a9df7 100644
--- a/trunk/drivers/regulator/tps6524x-regulator.c
+++ b/trunk/drivers/regulator/tps6524x-regulator.c
@@ -596,7 +596,7 @@ static struct regulator_ops regulator_ops = {
 	.get_current_limit	= get_current_limit,
 };
 
-static int __devexit pmic_remove(struct spi_device *spi)
+static int pmic_remove(struct spi_device *spi)
 {
 	struct tps6524x *hw = spi_get_drvdata(spi);
 	int i;