diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-29 20:36:18 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-29 20:36:18 -0700 |
| commit | f00e9b11863abdb837e555a2b1e3417e8b5d80dd (patch) | |
| tree | e7bf466d8c49d8bd86b3edb906a7ca5cd592bcf5 /arch/arm/mach-pxa/hx4700.c | |
| parent | a92e7023caf6c3a58b047a4c3fc9e4981b327bb8 (diff) | |
| parent | 5616131daff6047d293b25a05cff7b1890efd6a3 (diff) | |
| download | linux-f00e9b11863abdb837e555a2b1e3417e8b5d80dd.tar.gz linux-f00e9b11863abdb837e555a2b1e3417e8b5d80dd.tar.bz2 linux-f00e9b11863abdb837e555a2b1e3417e8b5d80dd.zip | |
Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
* 'fixes' of git://github.com/hzhuang1/linux:
ARM: pxa: fix build issue on stargate2
ARM: pxa: fix build issue on cm-x300
ARM: pxa: fix build failure for regulator consumer in em-x270.c
ARM: pxa: fix regulator related build fail in magician_defconfig
Diffstat (limited to 'arch/arm/mach-pxa/hx4700.c')
| -rw-r--r-- | arch/arm/mach-pxa/hx4700.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c index 3fa929d4a4f5..b83b95a29503 100644 --- a/arch/arm/mach-pxa/hx4700.c +++ b/arch/arm/mach-pxa/hx4700.c @@ -681,11 +681,9 @@ static struct platform_device power_supply = { static struct regulator_consumer_supply bq24022_consumers[] = { { - .dev = &gpio_vbus.dev, .supply = "vbus_draw", }, { - .dev = &power_supply.dev, .supply = "ac_draw", }, }; |