summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/cm-x300.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-03-30 07:36:18 +0400
committerOlof Johansson <olof@lixom.net>2012-03-30 07:36:18 +0400
commitf00e9b11863abdb837e555a2b1e3417e8b5d80dd (patch)
treee7bf466d8c49d8bd86b3edb906a7ca5cd592bcf5 /arch/arm/mach-pxa/cm-x300.c
parenta92e7023caf6c3a58b047a4c3fc9e4981b327bb8 (diff)
parent5616131daff6047d293b25a05cff7b1890efd6a3 (diff)
downloadlinux-f00e9b11863abdb837e555a2b1e3417e8b5d80dd.tar.xz
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/cm-x300.c')
-rw-r--r--arch/arm/mach-pxa/cm-x300.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c
index 895ee8c45009..0c920fccb79e 100644
--- a/arch/arm/mach-pxa/cm-x300.c
+++ b/arch/arm/mach-pxa/cm-x300.c
@@ -714,7 +714,6 @@ struct da9030_battery_info cm_x300_battery_info = {
static struct regulator_consumer_supply buck2_consumers[] = {
{
- .dev = NULL,
.supply = "vcc_core",
},
};