summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/mioa701.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-05-18 23:46:36 -0700
committerOlof Johansson <olof@lixom.net>2012-05-18 23:46:36 -0700
commit48a5765e5104f1afd22c75c5030af3a6cf24b4c3 (patch)
treeec2668d208146182d5ec6f5eba5d1a7266e10715 /arch/arm/mach-pxa/mioa701.c
parent0e6ce5f168e3b600b88d7e1a08c5b85cbceec6cb (diff)
parentb2596c682814b39f0dd16e19e3be8fc8581643bd (diff)
downloadlinux-48a5765e5104f1afd22c75c5030af3a6cf24b4c3.tar.bz2
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards
* 'board-specific' of git://github.com/hzhuang1/linux: ARM: pxa: hx4700: Add Synaptics NavPoint touchpad ARM: pxa: Use REGULATOR_SUPPLY macro
Diffstat (limited to 'arch/arm/mach-pxa/mioa701.c')
-rw-r--r--arch/arm/mach-pxa/mioa701.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c
index 929c62b47b76..bf99022b021f 100644
--- a/arch/arm/mach-pxa/mioa701.c
+++ b/arch/arm/mach-pxa/mioa701.c
@@ -582,9 +582,7 @@ static struct wm97xx_pdata mioa701_wm97xx_pdata = {
* Voltage regulation
*/
static struct regulator_consumer_supply max1586_consumers[] = {
- {
- .supply = "vcc_core",
- }
+ REGULATOR_SUPPLY("vcc_core", NULL),
};
static struct regulator_init_data max1586_v3_info = {