aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/Kconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-05-21 06:51:35 -0400
committerTakashi Iwai <tiwai@suse.de>2012-05-21 06:51:35 -0400
commit382e6a859e6622de0aa62c01976ae8ebd90e986d (patch)
tree2501c554c231c5d0fcda7ff2e6e055bf23134d6f /sound/pci/Kconfig
parent6de15b2a9330aeb5df9b66545f67c6c6ad2c045a (diff)
parent97f8d3b6503082416898f893a442a78f8819c42a (diff)
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/Kconfig')
-rw-r--r--sound/pci/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 5ca0939e4223..ff3af6e77d61 100644
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -228,7 +228,7 @@ config SND_OXYGEN
228 Say Y here to include support for sound cards based on the 228 Say Y here to include support for sound cards based on the
229 C-Media CMI8788 (Oxygen HD Audio) chip: 229 C-Media CMI8788 (Oxygen HD Audio) chip:
230 * Asound A-8788 230 * Asound A-8788
231 * Asus Xonar DG 231 * Asus Xonar DG/DGX
232 * AuzenTech X-Meridian 232 * AuzenTech X-Meridian
233 * AuzenTech X-Meridian 2G 233 * AuzenTech X-Meridian 2G
234 * Bgears b-Enspirer 234 * Bgears b-Enspirer