It's causing confusion with the regulator level field of the same name and serves no useful function.

Signed-off-by: Mark Brown broonie@opensource.wolfsonmicro.com --- arch/arm/mach-s3c64xx/mach-crag6410-module.c | 6 ++++-- include/linux/mfd/wm8994/pdata.h | 1 - 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c index e248581..77c8342 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c @@ -17,6 +17,8 @@ #include <linux/mfd/wm831x/gpio.h> #include <linux/mfd/wm8994/pdata.h>

+#include <linux/regulator/machine.h> + #include <sound/wm0010.h> #include <sound/wm5100.h> #include <sound/wm8996.h> @@ -168,8 +170,8 @@ static struct wm8994_pdata wm8994_pdata = { }, .irq_base = CODEC_IRQ_BASE, .ldo = { - { .supply = "WALLVDD" }, - { .supply = "WALLVDD" }, + { }, + { }, }, };

diff --git a/include/linux/mfd/wm8994/pdata.h b/include/linux/mfd/wm8994/pdata.h index dc3e050..893267b 100644 --- a/include/linux/mfd/wm8994/pdata.h +++ b/include/linux/mfd/wm8994/pdata.h @@ -22,7 +22,6 @@ struct wm8994_ldo_pdata { /** GPIOs to enable regulator, 0 or less if not available */ int enable;

- const char *supply; const struct regulator_init_data *init_data; };