diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-18 17:39:19 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-18 17:39:19 -0400 |
| commit | 115e4bfd5bc68f870b3c889ab8f2d2733bcda452 (patch) | |
| tree | d72053747d59cd5c537919990144c078d6b8cb55 /arch | |
| parent | c02f935f5f646fe1b5dbcd909e9d09c3a912914e (diff) | |
| parent | 5bc78015998e14bf0362a01fc47e8b63053dbfd8 (diff) | |
Merge remote-tracking branch 'regulator/topic/supply' into regulator-next
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-u300/i2c.c | 2 |
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[] = { | |||
| 60 | */ | 60 | */ |
| 61 | static struct regulator_consumer_supply supply_ldo_d[] = { | 61 | static struct regulator_consumer_supply supply_ldo_d[] = { |
| 62 | { | 62 | { |
| 63 | .dev = NULL, | ||
| 64 | .supply = "vana15", /* Powers the SoC (CPU etc) */ | 63 | .supply = "vana15", /* Powers the SoC (CPU etc) */ |
| 65 | }, | 64 | }, |
| 66 | }; | 65 | }; |
| @@ -92,7 +91,6 @@ static struct regulator_consumer_supply supply_ldo_k[] = { | |||
| 92 | */ | 91 | */ |
| 93 | static struct regulator_consumer_supply supply_ldo_ext[] = { | 92 | static struct regulator_consumer_supply supply_ldo_ext[] = { |
| 94 | { | 93 | { |
| 95 | .dev = NULL, | ||
| 96 | .supply = "vext", /* External power */ | 94 | .supply = "vext", /* External power */ |
| 97 | }, | 95 | }, |
| 98 | }; | 96 | }; |