From bed2910fa5add0014efc73c8f4bb6ac4a0a10c83 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 29 Dec 2011 21:21:49 +0000
Subject: [PATCH] --- yaml --- r: 293177 b: refs/heads/master c:
 1e9c898df0ef659dacbc9ee037f825cc380854cf h: refs/heads/master i:   293175:
 daa6d0128a4b9402d1b29228ba1db9e1f96e5a4c v: v3

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

diff --git a/[refs] b/[refs]
index c400b987f3df..50dbf2687156 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42dad0d84a318d5245b8b311644388dae5f521c0
+refs/heads/master: 1e9c898df0ef659dacbc9ee037f825cc380854cf
diff --git a/trunk/sound/soc/codecs/wm8955.c b/trunk/sound/soc/codecs/wm8955.c
index 924548182d58..adcfdcaa9fbc 100644
--- a/trunk/sound/soc/codecs/wm8955.c
+++ b/trunk/sound/soc/codecs/wm8955.c
@@ -1001,7 +1001,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8955 = {
 	.reg_cache_default = wm8955_reg,
 };
 
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 static __devinit int wm8955_i2c_probe(struct i2c_client *i2c,
 				      const struct i2c_device_id *id)
 {
@@ -1044,27 +1043,22 @@ static struct i2c_driver wm8955_i2c_driver = {
 	.remove =   __devexit_p(wm8955_i2c_remove),
 	.id_table = wm8955_i2c_id,
 };
-#endif
 
 static int __init wm8955_modinit(void)
 {
 	int ret = 0;
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 	ret = i2c_add_driver(&wm8955_i2c_driver);
 	if (ret != 0) {
 		printk(KERN_ERR "Failed to register WM8955 I2C driver: %d\n",
 		       ret);
 	}
-#endif
 	return ret;
 }
 module_init(wm8955_modinit);
 
 static void __exit wm8955_exit(void)
 {
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 	i2c_del_driver(&wm8955_i2c_driver);
-#endif
 }
 module_exit(wm8955_exit);