---

yaml --- r: 365166 b: refs/heads/master c: 574651f h: refs/heads/master v: v3
git-mirror · Mar 25, 2013 · 3eabed3 · 3eabed3
1 parent c9171b5
commit 3eabed3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbcf50b1d6b38e34958a1572f4077fa12d3dc24d
+refs/heads/master: 574651f0f8eac83ef4cded056272dcb97333aa68
diff --git a/trunk/drivers/regulator/palmas-regulator.c b/trunk/drivers/regulator/palmas-regulator.c
@@ -802,7 +802,6 @@ static int palmas_regulators_remove(struct platform_device *pdev)
 
 static struct of_device_id of_palmas_match_tbl[] = {
 	{ .compatible = "ti,palmas-pmic", },
-	{ .compatible = "ti,palmas-charger-pmic", },
 	{ .compatible = "ti,twl6035-pmic", },
 	{ .compatible = "ti,twl6036-pmic", },
 	{ .compatible = "ti,twl6037-pmic", },