projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
sound
/
pci
/
Kconfig
diff --git
a/sound/pci/Kconfig
b/sound/pci/Kconfig
index
8756c8e
..
8fcb10f
100644
(file)
--- a/
sound/pci/Kconfig
+++ b/
sound/pci/Kconfig
@@
-689,7
+689,7
@@
config SND_LOLA
config SND_LX6464ES
tristate "Digigram LX6464ES"
config SND_LX6464ES
tristate "Digigram LX6464ES"
- depends on HAS_IOPORT
+ depends on HAS_IOPORT
_MAP
select SND_PCM
help
Say Y here to include support for Digigram LX6464ES boards.
select SND_PCM
help
Say Y here to include support for Digigram LX6464ES boards.
@@
-859,8
+859,8
@@
config SND_VIRTUOSO
select SND_JACK if INPUT=y || INPUT=SND
help
Say Y here to include support for sound cards based on the
select SND_JACK if INPUT=y || INPUT=SND
help
Say Y here to include support for sound cards based on the
- Asus AV66/AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X, DS,
- Essence ST (Deluxe), and Essence STX.
+ Asus AV66/AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X, DS,
DSX,
+ Essence ST (Deluxe), and Essence STX
(II)
.
Support for the HDAV1.3 (Deluxe) and HDAV1.3 Slim is experimental;
for the Xense, missing.
Support for the HDAV1.3 (Deluxe) and HDAV1.3 Slim is experimental;
for the Xense, missing.