projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/hdmi', 'asoc/topic...
[linux-2.6-block.git]
/
sound
/
soc
/
codecs
/
Kconfig
diff --git
a/sound/soc/codecs/Kconfig
b/sound/soc/codecs/Kconfig
index acba444fe4754c9a26b0f63a00e2cba2e07f0950..7f516b6ee15040b4c6f91e4661892482b5b3b35f 100644
(file)
--- a/
sound/soc/codecs/Kconfig
+++ b/
sound/soc/codecs/Kconfig
@@
-87,6
+87,7
@@
config SND_SOC_ALL_CODECS
select SND_SOC_MAX98925 if I2C
select SND_SOC_MAX98926 if I2C
select SND_SOC_MAX9850 if I2C
select SND_SOC_MAX98925 if I2C
select SND_SOC_MAX98926 if I2C
select SND_SOC_MAX9850 if I2C
+ select SND_SOC_MAX9860 if I2C
select SND_SOC_MAX9768 if I2C
select SND_SOC_MAX9877 if I2C
select SND_SOC_MC13783 if MFD_MC13XXX
select SND_SOC_MAX9768 if I2C
select SND_SOC_MAX9877 if I2C
select SND_SOC_MC13783 if MFD_MC13XXX
@@
-568,6
+569,11
@@
config SND_SOC_MAX98926
config SND_SOC_MAX9850
tristate
config SND_SOC_MAX9850
tristate
+config SND_SOC_MAX9860
+ tristate "Maxim MAX9860 Mono Audio Voice Codec"
+ depends on I2C
+ select REGMAP_I2C
+
config SND_SOC_PCM1681
tristate "Texas Instruments PCM1681 CODEC"
depends on I2C
config SND_SOC_PCM1681
tristate "Texas Instruments PCM1681 CODEC"
depends on I2C