Merge tag 'for-linus-3.5-20120601' of git://git.infradead.org/linux-mtd

[~andy/linux] / arch / arm / mach-pxa / em-x270.c

diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
index 2771ad43e2587fa1fc38814fb48b37c7c2ba6f03..97f82ad341bfbcbb98123499856b8811106a223e 100644 (file)
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@ -1082,10 +1082,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");