diff options
| author |   Steve French <sfrench@us.ibm.com> | 2011-06-25 19:22:28 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-06-25 19:22:28 +0000 |
| commit | daf6c4501e048eed56b256401d030d6b28e92ff1 (patch) | |
| tree | 7b1af88901b9c62cba26f9d5694a05bf2a1badac /include | |
| parent | cifs: mark CONFIG_CIFS_NFSD_EXPORT as BROKEN (diff) | |
| parent | Merge branch 'timer-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include')
| -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, }; |