From e4baa7dee59305e890003ac81c6f014fa572df2a Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 17 Jan 2012 15:08:35 +0000
Subject: [PATCH] --- yaml --- r: 293199 b: refs/heads/master c:
 85f883933cd7353ab2227d5d2041312dce323e6b h: refs/heads/master i:   293197:
 b9e6f16a891cd9648499884e1ae6594ad861a239   293195:
 041b5400194665b71dcfc756195484f60c17106f   293191:
 9b1c6840fa44c1b1a74da3155441aed8eb19cb6f   293183:
 87c198dc719b3c65d13b87fe7cc0dbb3aafd14b1 v: v3

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

diff --git a/[refs] b/[refs]
index c1ab529aec5f..e3358a44d843 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 164548d3b3733b10990274e1e92848656e9d6d1e
+refs/heads/master: 85f883933cd7353ab2227d5d2041312dce323e6b
diff --git a/trunk/sound/soc/codecs/wm8993.c b/trunk/sound/soc/codecs/wm8993.c
index eca93521124c..5502543b8a26 100644
--- a/trunk/sound/soc/codecs/wm8993.c
+++ b/trunk/sound/soc/codecs/wm8993.c
@@ -1710,7 +1710,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8993 = {
 	.set_bias_level = wm8993_set_bias_level,
 };
 
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 static __devinit int wm8993_i2c_probe(struct i2c_client *i2c,
 				      const struct i2c_device_id *id)
 {
@@ -1838,27 +1837,22 @@ static struct i2c_driver wm8993_i2c_driver = {
 	.remove =   __devexit_p(wm8993_i2c_remove),
 	.id_table = wm8993_i2c_id,
 };
-#endif
 
 static int __init wm8993_modinit(void)
 {
 	int ret = 0;
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 	ret = i2c_add_driver(&wm8993_i2c_driver);
 	if (ret != 0) {
 		pr_err("WM8993: Unable to register I2C driver: %d\n",
 		       ret);
 	}
-#endif
 	return ret;
 }
 module_init(wm8993_modinit);
 
 static void __exit wm8993_exit(void)
 {
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 	i2c_del_driver(&wm8993_i2c_driver);
-#endif
 }
 module_exit(wm8993_exit);