projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pm+acpi-4.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[linux-2.6-microblaze.git]
/
sound
/
soc
/
Kconfig
diff --git
a/sound/soc/Kconfig
b/sound/soc/Kconfig
index
7ea66ee
..
182d92e
100644
(file)
--- a/
sound/soc/Kconfig
+++ b/
sound/soc/Kconfig
@@
-6,7
+6,7
@@
menuconfig SND_SOC
tristate "ALSA for SoC audio support"
select SND_PCM
select AC97_BUS if SND_SOC_AC97_BUS
- select SND_JACK
if INPUT=y || INPUT=SND
+ select SND_JACK
select REGMAP_I2C if I2C
select REGMAP_SPI if SPI_MASTER
---help---