diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-29 12:12:45 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-20 14:58:18 +0100 |
| commit | 0d6df67583bb40fdc365210740bcce0bd27420f7 (patch) | |
| tree | 0682493a719c5063763ebff8616ec12b00ea60b2 /sound/soc | |
| parent | ASoC: Disable register synchronisation for low frequency WM8996 SYSCLK (diff) | |
| download | linux-0d6df67583bb40fdc365210740bcce0bd27420f7.tar.xz linux-0d6df67583bb40fdc365210740bcce0bd27420f7.zip | |
ASoC: Make WM8978 I2C usage unconditional
The driver only supports I2C.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm8978.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c index 85d514d63a4c..0b1f7ada17bc 100644 --- a/sound/soc/codecs/wm8978.c +++ b/sound/soc/codecs/wm8978.c @@ -1001,7 +1001,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8978 = { .reg_cache_default = wm8978_reg, }; -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) static __devinit int wm8978_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { @@ -1043,27 +1042,22 @@ static struct i2c_driver wm8978_i2c_driver = { .remove = __devexit_p(wm8978_i2c_remove), .id_table = wm8978_i2c_id, }; -#endif static int __init wm8978_modinit(void) { int ret = 0; -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) ret = i2c_add_driver(&wm8978_i2c_driver); if (ret != 0) { printk(KERN_ERR "Failed to register WM8978 I2C driver: %d\n", ret); } -#endif return ret; } module_init(wm8978_modinit); static void __exit wm8978_exit(void) { -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) i2c_del_driver(&wm8978_i2c_driver); -#endif } module_exit(wm8978_exit); |