diff options
author | Olof Johansson <olof@lixom.net> | 2012-05-18 23:46:36 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-05-18 23:46:36 -0700 |
commit | 48a5765e5104f1afd22c75c5030af3a6cf24b4c3 (patch) | |
tree | ec2668d208146182d5ec6f5eba5d1a7266e10715 /arch/arm/mach-pxa/em-x270.c | |
parent | 0e6ce5f168e3b600b88d7e1a08c5b85cbceec6cb (diff) | |
parent | b2596c682814b39f0dd16e19e3be8fc8581643bd (diff) |
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boardsboards
* '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/em-x270.c')
-rw-r--r-- | arch/arm/mach-pxa/em-x270.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index 16ec557b8e43..a3a4a38d4972 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c @@ -1085,10 +1085,7 @@ static void __init em_x270_userspace_consumers_init(void) /* DA9030 related initializations */ #define REGULATOR_CONSUMER(_name, _dev_name, _supply) \ static struct regulator_consumer_supply _name##_consumers[] = { \ - { \ - .dev_name = _dev_name, \ - .supply = _supply, \ - }, \ + REGULATOR_SUPPLY(_supply, _dev_name), \ } REGULATOR_CONSUMER(ldo3, "reg-userspace-consumer.0", "vcc gps"); |