From 174e6ebfd5268b8f1d647f290ac5e2c0c0eeedab Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 18 Feb 2009 12:34:53 +0000
Subject: [PATCH] --- yaml --- r: 132851 b: refs/heads/master c:
 fc9967576829a01c98e5388410dc12c61006f79f h: refs/heads/master i:   132849:
 9dcfd916cba21b9f5fd66fb8aa9c7c03ac4a5bea   132847:
 28d03469929dd1a929632ed73954b8eaac5c8227 v: v3

---
 [refs]                       | 2 +-
 trunk/sound/soc/pxa/corgi.c  | 3 ++-
 trunk/sound/soc/pxa/poodle.c | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0d9962b9bae1..41383bd6a518 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59544d33ff3118f22a484d8be06cdf5cfc2fdca5
+refs/heads/master: fc9967576829a01c98e5388410dc12c61006f79f
diff --git a/trunk/sound/soc/pxa/corgi.c b/trunk/sound/soc/pxa/corgi.c
index eaa66915a324..146973ae0974 100644
--- a/trunk/sound/soc/pxa/corgi.c
+++ b/trunk/sound/soc/pxa/corgi.c
@@ -16,6 +16,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/timer.h>
+#include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
@@ -365,7 +366,7 @@ static int __init corgi_init(void)
 	      machine_is_husky()))
 		return -ENODEV;
 
-	ret = wm8731_i2c_setup();
+	ret = wm8731_i2c_register();
 	if (ret != 0)
 		return ret;
 
diff --git a/trunk/sound/soc/pxa/poodle.c b/trunk/sound/soc/pxa/poodle.c
index fd683a0b742d..fb17a0a5a093 100644
--- a/trunk/sound/soc/pxa/poodle.c
+++ b/trunk/sound/soc/pxa/poodle.c
@@ -17,6 +17,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/timer.h>
+#include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <sound/core.h>
@@ -330,7 +331,7 @@ static int __init poodle_init(void)
 	if (!machine_is_poodle())
 		return -ENODEV;
 
-	ret = wm8731_i2c_setup();
+	ret = wm8731_i2c_register();
 	if (ret != 0)
 		return ret;