From 7b36003a45cf6ffb9bbd6a9333073d100969e9db Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 29 Dec 2011 11:08:21 +0000
Subject: [PATCH] --- yaml --- r: 293165 b: refs/heads/master c:
 7a389651bd88f884b46ddcada78730d294ccf1eb h: refs/heads/master i:   293163:
 4477398da0682da96a67f025bef3fd22aa159463 v: v3

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

diff --git a/[refs] b/[refs]
index d6724d64c7eb..19b85a33b17e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 028b0a0a92daa36bd9e0f6d01954fe67c969a095
+refs/heads/master: 7a389651bd88f884b46ddcada78730d294ccf1eb
diff --git a/trunk/sound/soc/codecs/wm8974.c b/trunk/sound/soc/codecs/wm8974.c
index 4a6a7b5a61ba..80c264e3ef87 100644
--- a/trunk/sound/soc/codecs/wm8974.c
+++ b/trunk/sound/soc/codecs/wm8974.c
@@ -636,7 +636,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8974 = {
 	.reg_cache_default = wm8974_reg,
 };
 
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 static __devinit int wm8974_i2c_probe(struct i2c_client *i2c,
 				      const struct i2c_device_id *id)
 {
@@ -678,27 +677,22 @@ static struct i2c_driver wm8974_i2c_driver = {
 	.remove =   __devexit_p(wm8974_i2c_remove),
 	.id_table = wm8974_i2c_id,
 };
-#endif
 
 static int __init wm8974_modinit(void)
 {
 	int ret = 0;
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 	ret = i2c_add_driver(&wm8974_i2c_driver);
 	if (ret != 0) {
 		printk(KERN_ERR "Failed to register wm8974 I2C driver: %d\n",
 		       ret);
 	}
-#endif
 	return ret;
 }
 module_init(wm8974_modinit);
 
 static void __exit wm8974_exit(void)
 {
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 	i2c_del_driver(&wm8974_i2c_driver);
-#endif
 }
 module_exit(wm8974_exit);