summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-18 21:39:19 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-18 21:39:19 +0000
commit115e4bfd5bc68f870b3c889ab8f2d2733bcda452 (patch)
treed72053747d59cd5c537919990144c078d6b8cb55 /arch
parentc02f935f5f646fe1b5dbcd909e9d09c3a912914e (diff)
parent5bc78015998e14bf0362a01fc47e8b63053dbfd8 (diff)
downloadlinux-115e4bfd5bc68f870b3c889ab8f2d2733bcda452.tar.bz2
Merge remote-tracking branch 'regulator/topic/supply' into regulator-next
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-u300/i2c.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-u300/i2c.c b/arch/arm/mach-u300/i2c.c
index 5140deeddf7b..a38f80238ea9 100644
--- a/arch/arm/mach-u300/i2c.c
+++ b/arch/arm/mach-u300/i2c.c
@@ -60,7 +60,6 @@ static struct regulator_consumer_supply supply_ldo_c[] = {
*/
static struct regulator_consumer_supply supply_ldo_d[] = {
{
- .dev = NULL,
.supply = "vana15", /* Powers the SoC (CPU etc) */
},
};
@@ -92,7 +91,6 @@ static struct regulator_consumer_supply supply_ldo_k[] = {
*/
static struct regulator_consumer_supply supply_ldo_ext[] = {
{
- .dev = NULL,
.supply = "vext", /* External power */
},
};