diff options
| author | Olof Johansson | 2012-05-19 08:46:36 +0200 |
|---|---|---|
| committer | Olof Johansson | 2012-05-19 08:46:36 +0200 |
| commit | 48a5765e5104f1afd22c75c5030af3a6cf24b4c3 (patch) | |
| tree | ec2668d208146182d5ec6f5eba5d1a7266e10715 /arch/arm/mach-pxa/balloon3.c | |
| parent | Merge branch 'renesas/board2' into next/boards (diff) | |
| parent | ARM: pxa: hx4700: Add Synaptics NavPoint touchpad (diff) | |
| download | kernel-qcow2-linux-48a5765e5104f1afd22c75c5030af3a6cf24b4c3.tar.gz kernel-qcow2-linux-48a5765e5104f1afd22c75c5030af3a6cf24b4c3.tar.xz kernel-qcow2-linux-48a5765e5104f1afd22c75c5030af3a6cf24b4c3.zip | |
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/balloon3.c')
| -rw-r--r-- | arch/arm/mach-pxa/balloon3.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c index c35456f02acb..56e8cebeb7d5 100644 --- a/arch/arm/mach-pxa/balloon3.c +++ b/arch/arm/mach-pxa/balloon3.c @@ -732,9 +732,7 @@ static inline void balloon3_nand_init(void) {} #if defined(CONFIG_REGULATOR_MAX1586) || \ defined(CONFIG_REGULATOR_MAX1586_MODULE) static struct regulator_consumer_supply balloon3_max1587a_consumers[] = { - { - .supply = "vcc_core", - } + REGULATOR_SUPPLY("vcc_core", NULL), }; static struct regulator_init_data balloon3_max1587a_v3_info = { |