diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-13 20:21:09 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-13 20:21:09 +0200 |
| commit | 65fdd5c05a02b15bbfa5b0f4f050fdb25b9227f1 (patch) | |
| tree | d2a22f1ac24d8b4269e9011db83e1d3b1318408d /include/sound | |
| parent | ASoC: Don't use codec->control_data in bulk write (diff) | |
| parent | ASoC: Remove unused and about to be broken SND_SOC_CUSTOM I/O bus (diff) | |
| download | linux-65fdd5c05a02b15bbfa5b0f4f050fdb25b9227f1.tar.xz linux-65fdd5c05a02b15bbfa5b0f4f050fdb25b9227f1.zip | |
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 'include/sound')
| -rw-r--r-- | include/sound/soc.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 4334ab25c5d5..6424b10ac29c 100644 --- 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, }; |