diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-29 20:03:23 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-20 13:58:23 +0000 |
| commit | 429440c947e72b6f6f317fa4346ddebf9d5e5413 (patch) | |
| tree | b454ff07fb63350590d9f3e3d6e68dc747efb64f /sound/soc | |
| parent | 891271c28f06881332c6131158ea13f328401aa7 (diff) | |
| download | linux-429440c947e72b6f6f317fa4346ddebf9d5e5413.tar.gz linux-429440c947e72b6f6f317fa4346ddebf9d5e5413.tar.bz2 linux-429440c947e72b6f6f317fa4346ddebf9d5e5413.zip | |
ASoC: Make WM8904 I2C usage unconditional
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm8904.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index f31c754c8865..1ad93737f0fa 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c @@ -2525,7 +2525,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8904 = { .volatile_register = wm8904_volatile_register, }; -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) static __devinit int wm8904_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { @@ -2571,27 +2570,22 @@ static struct i2c_driver wm8904_i2c_driver = { .remove = __devexit_p(wm8904_i2c_remove), .id_table = wm8904_i2c_id, }; -#endif static int __init wm8904_modinit(void) { int ret = 0; -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) ret = i2c_add_driver(&wm8904_i2c_driver); if (ret != 0) { printk(KERN_ERR "Failed to register wm8904 I2C driver: %d\n", ret); } -#endif return ret; } module_init(wm8904_modinit); static void __exit wm8904_exit(void) { -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) i2c_del_driver(&wm8904_i2c_driver); -#endif } module_exit(wm8904_exit); |