From 4244c702649789d3f57cde96a0e65786ca6da053 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 16 Mar 2012 19:36:29 +0100
Subject: [PATCH] --- yaml --- r: 296871 b: refs/heads/master c:
 719a42402b3abd2323c31a03bc8f03d6b8c78eaf h: refs/heads/master i:   296869:
 ad436dd7c20c6a2f4fed018916521b7164fc00b2   296867:
 67d087167444c4909a1e9ee97d755b790b09e43d   296863:
 d5fae3cebcf07df906e6802f6bfcef183b09d70f v: v3

---
 [refs]                                             | 2 +-
 trunk/arch/arm/mach-s3c64xx/mach-crag6410-module.c | 6 ++++--
 trunk/include/linux/mfd/wm8994/pdata.h             | 1 -
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7791f61ec260..876788ba5e06 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39ecb0376508b5cd20a951388d10aed2d719a77f
+refs/heads/master: 719a42402b3abd2323c31a03bc8f03d6b8c78eaf
diff --git a/trunk/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/trunk/arch/arm/mach-s3c64xx/mach-crag6410-module.c
index cd3c97e2ee75..e1ea2ffb6c02 100644
--- a/trunk/arch/arm/mach-s3c64xx/mach-crag6410-module.c
+++ b/trunk/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/trunk/include/linux/mfd/wm8994/pdata.h b/trunk/include/linux/mfd/wm8994/pdata.h
index 3fb1f407d5e6..4c1fb71c8107 100644
--- a/trunk/include/linux/mfd/wm8994/pdata.h
+++ b/trunk/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;
 };