summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-06-13 18:21:09 (GMT)
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-06-13 18:21:09 (GMT)
commit65fdd5c05a02b15bbfa5b0f4f050fdb25b9227f1 (patch)
treed2a22f1ac24d8b4269e9011db83e1d3b1318408d /include/sound
parent223157121404a7ca4deaf2aa31a57cad8d133d07 (diff)
parente9c039052be59753e6bcc7c8b59763899dc1161c (diff)
downloadlinux-65fdd5c05a02b15bbfa5b0f4f050fdb25b9227f1.tar.xz
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.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 4334ab2..6424b10 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,
};