diff options
| author | James Morris <jmorris@namei.org> | 2011-06-30 18:43:56 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-06-30 18:43:56 +1000 |
| commit | 5b944a71a192977c1c018bbcfa0c52dca48e2368 (patch) | |
| tree | 9f234c4a93bb28890ad086c846d2bf0b35f7f7ae /include/sound/soc.h | |
| parent | 0e4ae0e0dec634b2ae53ac57d14141b140467dbe (diff) | |
| parent | c017d0d1351f916c0ced3f358afc491fdcf490b4 (diff) | |
| download | blackbird-op-linux-5b944a71a192977c1c018bbcfa0c52dca48e2368.tar.gz blackbird-op-linux-5b944a71a192977c1c018bbcfa0c52dca48e2368.zip | |
Merge branch 'linus' into next
Diffstat (limited to 'include/sound/soc.h')
| -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 f1de3e0c75bc..3a4bd3a3c68d 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -248,8 +248,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, }; |
