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

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 4334ab25c5d52721de0a7dbc9d77ea8d1ee0d886..6424b10ac29c0c9dbfae2f0af1e4309517a87eac 100644 (file)
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -258,8 +258,7 @@ typedef int (*hw_write_t)(void *,const char* ,int);
 extern struct snd_ac97_bus_ops soc_ac97_ops;
 
 enum snd_soc_control_type {
-       SND_SOC_CUSTOM = 1,
-       SND_SOC_I2C,
+       SND_SOC_I2C = 1,
        SND_SOC_SPI,
 };
 

diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index df9338aa1a52cef7f8e58665372733ee5a9a2db0..cca490c80589db6e5c5f402da6dda77c988bf41e 100644 (file)
--- 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;