luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'for-3.0' into for-3.1

Browse Source 
Trival fixup for move of I/O code into separate file.

Conflicts:
	sound/soc/soc-cache.c
This commit is contained in:
Mark Brown 2011-06-13 19:21:09 +01:00
commit 65fdd5c05a
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/sound/soc.h
View File

@ -258,8 +258,7 @@ typedef int (*hw_write_t)(void *,const char* ,int);
extern struct snd_ac97_bus_ops soc_ac97_ops; extern struct snd_ac97_bus_ops soc_ac97_ops;
enum snd_soc_control_type { enum snd_soc_control_type {
SND_SOC_CUSTOM = 1, SND_SOC_I2C = 1,
SND_SOC_I2C,
SND_SOC_SPI, SND_SOC_SPI,
}; };

3
sound/soc/soc-io.c
View File

@ -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; codec->bulk_write_raw = snd_soc_hw_bulk_write_raw;
switch (control) { switch (control) {
case SND_SOC_CUSTOM:
break;
case SND_SOC_I2C: case SND_SOC_I2C:
#if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE)) #if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE))
codec->hw_write = (hw_write_t)i2c_master_send; codec->hw_write = (hw_write_t)i2c_master_send;