Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6

[powerpc.git] / sound / pci / Kconfig

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 1e45891..0fb16cf 100644 (file)
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -1,13 +1,5 @@
 # ALSA PCI drivers
 
-config SND_AC97_CODEC
-       tristate
-       select SND_PCM
-       select SND_AC97_BUS
-
-config SND_AC97_BUS
-       tristate
-
 menu "PCI devices"
        depends on SND!=n && PCI
 
@@ -192,6 +184,7 @@ config SND_CA0106
        tristate "SB Audigy LS / Live 24bit"
        depends on SND
        select SND_AC97_CODEC
+       select SND_RAWMIDI
        help
          Say Y here to include support for the Sound Blaster Audigy LS
          and Live 24bit.
@@ -316,6 +309,18 @@ config SND_YMFPCI
          To compile this driver as a module, choose M here: the module
          will be called snd-ymfpci.
 
+config SND_AD1889
+       tristate "Analog Devices AD1889"
+       depends on SND
+       select SND_AC97_CODEC
+       help
+         Say Y here to include support for the integrated AC97 sound
+         device found in particular on the Hewlett-Packard [BCJ]-xxx0
+         class PA-RISC workstations, using the AD1819 codec.
+
+         To compile this as a module, choose M here: the module
+         will be called snd-ad1889.
+
 config SND_ALS4000
        tristate "Avance Logic ALS4000"
        depends on SND && ISA_DMA_API