From 8ea6f0e4a8cd50ba6add4245cb947612b3fea367 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 21 Nov 2011 12:11:37 +0000
Subject: [PATCH] --- yaml --- r: 283743 b: refs/heads/master c:
 12a7a709a09aac117b630264cdd526e20d4d0ce2 h: refs/heads/master i:   283741:
 8e45d8fdf1fef9a6b5ab99ebca771a6db5297d49   283739:
 e9701e13c940c2741400aefe233f8e40b09121ad   283735:
 3a584f77744974b4aa700e0495ce41388011c054   283727:
 cf0b72642ce64729f1796c6993cb4ca65f7d0973   283711:
 26573e33432325b25dcd1882a0c816963b4b8472 v: v3

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

diff --git a/[refs] b/[refs]
index 879ab6dae723..f76988d218da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f733547aa30b9e85cc5f2739f3c236408157d2ce
+refs/heads/master: 12a7a709a09aac117b630264cdd526e20d4d0ce2
diff --git a/trunk/sound/soc/codecs/tlv320aic3x.c b/trunk/sound/soc/codecs/tlv320aic3x.c
index 14cb5534ce8b..2e2bf18253c8 100644
--- a/trunk/sound/soc/codecs/tlv320aic3x.c
+++ b/trunk/sound/soc/codecs/tlv320aic3x.c
@@ -1481,7 +1481,6 @@ static struct snd_soc_codec_driver soc_codec_dev_aic3x = {
 	.resume = aic3x_resume,
 };
 
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 /*
  * AIC3X 2 wire address can be up to 4 devices with device addresses
  * 0x18, 0x19, 0x1A, 0x1B
@@ -1548,27 +1547,22 @@ static struct i2c_driver aic3x_i2c_driver = {
 	.remove = aic3x_i2c_remove,
 	.id_table = aic3x_i2c_id,
 };
-#endif
 
 static int __init aic3x_modinit(void)
 {
 	int ret = 0;
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 	ret = i2c_add_driver(&aic3x_i2c_driver);
 	if (ret != 0) {
 		printk(KERN_ERR "Failed to register TLV320AIC3x I2C driver: %d\n",
 		       ret);
 	}
-#endif
 	return ret;
 }
 module_init(aic3x_modinit);
 
 static void __exit aic3x_exit(void)
 {
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 	i2c_del_driver(&aic3x_i2c_driver);
-#endif
 }
 module_exit(aic3x_exit);