From 3eabed30827d506550ef8014e5925a2433436dee Mon Sep 17 00:00:00 2001 From: Ian Lartey Date: Fri, 22 Mar 2013 14:55:22 +0000 Subject: [PATCH] --- yaml --- r: 365166 b: refs/heads/master c: 574651f0f8eac83ef4cded056272dcb97333aa68 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/palmas-regulator.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d8ba7f2f0dac..7a5c9e871345 100644 --- 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 index aec2d76096dd..3bd61bd02a46 100644 --- 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", },