diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-06-24 06:36:25 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-06-24 06:36:25 -0400 |
| commit | e0938118576954ac4deafbdb9950cebd34f726c6 (patch) | |
| tree | 87000bd3ce37651b4b559489e7f1f6dbd4385e0c /include | |
| parent | 16866741bda5d16f3d30d1656ce941faf5dad34c (diff) | |
| parent | 53dea36c70c1857149a8c447224e3936eb8b5339 (diff) | |
Merge branch 'fix/asoc' into for-linus
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); | |||
| 248 | extern struct snd_ac97_bus_ops soc_ac97_ops; | 248 | extern struct snd_ac97_bus_ops soc_ac97_ops; |
| 249 | 249 | ||
| 250 | enum snd_soc_control_type { | 250 | enum snd_soc_control_type { |
| 251 | SND_SOC_CUSTOM = 1, | 251 | SND_SOC_I2C = 1, |
| 252 | SND_SOC_I2C, | ||
| 253 | SND_SOC_SPI, | 252 | SND_SOC_SPI, |
| 254 | }; | 253 | }; |
| 255 | 254 | ||