diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-16 19:36:29 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-03-16 19:36:29 +0100 |
| commit | 719a42402b3abd2323c31a03bc8f03d6b8c78eaf (patch) | |
| tree | 0b38403252dae1c3233bce34c5129286edbaa602 | |
| parent | 39ecb0376508b5cd20a951388d10aed2d719a77f (diff) | |
mfd: Remove unused LDO supply field from WM8994 pdata
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>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410-module.c | 6 | ||||
| -rw-r--r-- | 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 cd3c97e2ee7..e1ea2ffb6c0 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c @@ -16,6 +16,8 @@ #include <linux/mfd/wm831x/gpio.h> #include <linux/mfd/wm8994/pdata.h> +#include <linux/regulator/machine.h> + #include <sound/wm5100.h> #include <sound/wm8996.h> #include <sound/wm8962.h> @@ -141,8 +143,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 3fb1f407d5e..4c1fb71c810 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; }; |