summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-06-24 12:36:25 +0200
committerTakashi Iwai <tiwai@suse.de>2011-06-24 12:36:25 +0200
commite0938118576954ac4deafbdb9950cebd34f726c6 (patch)
tree87000bd3ce37651b4b559489e7f1f6dbd4385e0c /include
parent16866741bda5d16f3d30d1656ce941faf5dad34c (diff)
parent53dea36c70c1857149a8c447224e3936eb8b5339 (diff)
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'include')
-rw-r--r--include/sound/soc.h3
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,
};