summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/magician.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-03-30 05:36:18 +0200
committerOlof Johansson <olof@lixom.net>2012-03-30 05:36:18 +0200
commitf00e9b11863abdb837e555a2b1e3417e8b5d80dd (patch)
treee7bf466d8c49d8bd86b3edb906a7ca5cd592bcf5 /arch/arm/mach-pxa/magician.c
parentMerge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/... (diff)
parentARM: pxa: fix build issue on stargate2 (diff)
downloadlinux-f00e9b11863abdb837e555a2b1e3417e8b5d80dd.tar.xz
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/magician.c')
-rw-r--r--arch/arm/mach-pxa/magician.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index 6f4785b347c2..8de0651d7efb 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -580,11 +580,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",
},
};