projects
/
cascardo
/
linux.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/max98504', 'asoc/topic/max9867', 'asoc...
[cascardo/linux.git]
/
sound
/
soc
/
codecs
/
Kconfig
diff --git
a/sound/soc/codecs/Kconfig
b/sound/soc/codecs/Kconfig
index
7f516b6
..
867d7f9
100644
(file)
--- a/
sound/soc/codecs/Kconfig
+++ b/
sound/soc/codecs/Kconfig
@@
-557,6
+557,10
@@
config SND_SOC_MAX98357A
config SND_SOC_MAX98371
tristate
+config SND_SOC_MAX98504
+ tristate "Maxim MAX98504 speaker amplifier"
+ depends on I2C
+
config SND_SOC_MAX9867
tristate