projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 50946b2 56af0e4 7c0c200 362c594 babd658)
Merge remote-tracking branches 'asoc/topic/max9878', 'asoc/topic/max98927', 'asoc...
authorMark Brown <broonie@kernel.org>
Sun, 30 Apr 2017 13:16:04 +0000 (22:16 +0900)
committerMark Brown <broonie@kernel.org>
Sun, 30 Apr 2017 13:16:04 +0000 (22:16 +0900)
1  2  3  4  5 
sound/soc/codecs/Kconfig patch | diff1 | diff2 | diff3 | diff4 | diff5 | blob | history
sound/soc/codecs/Makefile patch | diff1 | diff2 | diff3 | diff4 | diff5 | blob | history
sound/soc/codecs/max9867.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | blob | history

diff --cc sound/soc/codecs/Kconfig
index 70decab,9e1718a,65e31ab,e49e9da,e49e9da..1957521
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
--- 3/sound/soc/codecs/Kconfig
--- 4/sound/soc/codecs/Kconfig
--- 5/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@@@@ -538,15 -524,11 -525,11 -525,12 -525,12 +539,15 @@@@@@ config SND_SOC_HDMI_CODE
        select SND_PCM_IEC958
        select HDMI
     
 ++++config SND_SOC_ES7134
 ++++       tristate "Everest Semi ES7134 CODEC"
 ++++
     config SND_SOC_ES8328
 --     tristate "Everest Semi ES8328 CODEC"
 ++     tristate
     
     config SND_SOC_ES8328_I2C
 --     tristate
 ++     tristate "Everest Semi ES8328 CODEC (I2C)"
 ++     depends on I2C
        select SND_SOC_ES8328
     
     config SND_SOC_ES8328_SPI
diff --cc sound/soc/codecs/Makefile
Simple merge
diff --cc sound/soc/codecs/max9867.c
Simple merge
Domain: System / Kernel;