diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-13 19:21:09 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-13 19:21:09 +0100 |
| commit | 65fdd5c05a02b15bbfa5b0f4f050fdb25b9227f1 (patch) | |
| tree | d2a22f1ac24d8b4269e9011db83e1d3b1318408d /sound/soc | |
| parent | 223157121404a7ca4deaf2aa31a57cad8d133d07 (diff) | |
| parent | e9c039052be59753e6bcc7c8b59763899dc1161c (diff) | |
| download | linux-65fdd5c05a02b15bbfa5b0f4f050fdb25b9227f1.tar.bz2 | |
Merge branch 'for-3.0' into for-3.1
Trival fixup for move of I/O code into separate file.
Conflicts:
sound/soc/soc-cache.c
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/soc-io.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c index df9338aa1a52..cca490c80589 100644 --- a/sound/soc/soc-io.c +++ b/sound/soc/soc-io.c @@ -367,9 +367,6 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec, codec->bulk_write_raw = snd_soc_hw_bulk_write_raw; switch (control) { - case SND_SOC_CUSTOM: - break; - case SND_SOC_I2C: #if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE)) codec->hw_write = (hw_write_t)i2c_master_send; |