Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / include / linux / mfd / mc13xxx.h

diff --git a/include/linux/mfd/mc13xxx.h b/include/linux/mfd/mc13xxx.h
index a1d391b..c064bea 100644 (file)
--- a/include/linux/mfd/mc13xxx.h
+++ b/include/linux/mfd/mc13xxx.h
@@ -146,8 +146,7 @@ struct mc13xxx_platform_data {
 #define MC13XXX_USE_LED                (1 << 5)
        unsigned int flags;
 
-       int num_regulators;
-       struct mc13xxx_regulator_init_data *regulators;
+       struct mc13xxx_regulator_platform_data regulators;
        struct mc13xxx_leds_platform_data *leds;
 };