diff options
author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
---|---|---|
committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
tree | 644b88f8a71896307d71438e9b3af49126ffb22b /sound/pci/Kconfig | |
parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'sound/pci/Kconfig')
-rw-r--r-- | sound/pci/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 75c602b5b132..1298c68d6bf0 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig | |||
@@ -570,6 +570,7 @@ config SND_ICE1712 | |||
570 | tristate "ICEnsemble ICE1712 (Envy24)" | 570 | tristate "ICEnsemble ICE1712 (Envy24)" |
571 | select SND_MPU401_UART | 571 | select SND_MPU401_UART |
572 | select SND_AC97_CODEC | 572 | select SND_AC97_CODEC |
573 | select BITREVERSE | ||
573 | help | 574 | help |
574 | Say Y here to include support for soundcards based on the | 575 | Say Y here to include support for soundcards based on the |
575 | ICE1712 (Envy24) chip. | 576 | ICE1712 (Envy24) chip. |
@@ -788,6 +789,7 @@ config SND_VIRTUOSO | |||
788 | 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 |
789 | Asus AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X, | 790 | Asus AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X, |
790 | Essence ST (Deluxe), and Essence STX. | 791 | Essence ST (Deluxe), and Essence STX. |
792 | Support for the DS is experimental. | ||
791 | Support for the HDAV1.3 (Deluxe) is very experimental. | 793 | Support for the HDAV1.3 (Deluxe) is very experimental. |
792 | 794 | ||
793 | To compile this driver as a module, choose M here: the module | 795 | To compile this driver as a module, choose M here: the module |