From 47aea8bf62797fd7d6b4f2d1b554082da14855e6 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 8 Mar 2012 15:59:50 +0000
Subject: [PATCH] --- yaml --- r: 293497 b: refs/heads/master c:
 da7f910bd0d3da2355b29dd19f4dcd4dfe3563e4 h: refs/heads/master i:   293495:
 fa7596a6af05c87b087eb8700e740584aa4d6ea2 v: v3

---
 [refs]                          | 2 +-
 trunk/sound/soc/codecs/wm8996.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ccdf96b21ee1..4cc8baca24ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e4ba569a5aa631852ec8240f11142392116633d
+refs/heads/master: da7f910bd0d3da2355b29dd19f4dcd4dfe3563e4
diff --git a/trunk/sound/soc/codecs/wm8996.c b/trunk/sound/soc/codecs/wm8996.c
index 9376b19941b6..dd94cd035ac7 100644
--- a/trunk/sound/soc/codecs/wm8996.c
+++ b/trunk/sound/soc/codecs/wm8996.c
@@ -118,7 +118,6 @@ WM8996_REGULATOR_EVENT(1)
 WM8996_REGULATOR_EVENT(2)
 
 static struct reg_default wm8996_reg[] = {
-	{ WM8996_SOFTWARE_RESET, 0x8996 },
 	{ WM8996_POWER_MANAGEMENT_1, 0x0 },
 	{ WM8996_POWER_MANAGEMENT_2, 0x0 },
 	{ WM8996_POWER_MANAGEMENT_3, 0x0 },
@@ -153,7 +152,6 @@ static struct reg_default wm8996_reg[] = {
 	{ WM8996_CHARGE_PUMP_1, 0x1f25 },
 	{ WM8996_CHARGE_PUMP_2, 0xab19 },
 	{ WM8996_DC_SERVO_1, 0x0 },
-	{ WM8996_DC_SERVO_2, 0x0 },
 	{ WM8996_DC_SERVO_3, 0x0 },
 	{ WM8996_DC_SERVO_5, 0x2a2a },
 	{ WM8996_DC_SERVO_6, 0x0 },