diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-10 01:26:39 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-10 01:26:39 -0400 |
| commit | 9dea75c70965c240012251dc5845fe0c1a061180 (patch) | |
| tree | d4779c1392bb8aa800f0e3cb12af9161e8f217db /sound/pci/Kconfig | |
| parent | 8c3ff3a7fb9730564554bb65d54455e6ce8ad340 (diff) | |
| parent | 04f9890df1bad2115665b7027e664aaffa44088d (diff) | |
Merge branch 'topic/oxygen' into for-linus
* topic/oxygen:
sound: virtuoso: add Xonar Essence ST support
sound: virtuoso: enable HDAV S/PDIF input
sound: virtuoso: add another DX PCI ID
sound: oxygen: reset DMA when stream is closed
Diffstat (limited to 'sound/pci/Kconfig')
| -rw-r--r-- | sound/pci/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index b306bb457a41..748f6b7d90b7 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig | |||
| @@ -787,8 +787,8 @@ config SND_VIRTUOSO | |||
| 787 | select SND_OXYGEN_LIB | 787 | select SND_OXYGEN_LIB |
| 788 | help | 788 | help |
| 789 | Say Y here to include support for sound cards based on the | 789 | Say Y here to include support for sound cards based on the |
| 790 | Asus AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X, and | 790 | Asus AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X, |
| 791 | Essence STX. | 791 | Essence ST (Deluxe), and Essence STX. |
| 792 | Support for the HDAV1.3 (Deluxe) is very experimental. | 792 | Support for the HDAV1.3 (Deluxe) is very experimental. |
| 793 | 793 | ||
| 794 | To compile this driver as a module, choose M here: the module | 794 | To compile this driver as a module, choose M here: the module |