diff options
author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2009-12-10 20:39:28 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-11 14:43:04 +0100 |
commit | 14ff3e78304e3f7fe18f950c3aa0686e6800b3fb (patch) | |
tree | 967c746fd0247aa74c68d9b3b38a90b167bad39c /sound/isa/Kconfig | |
parent | 3067e02f8f3ae2f3f02ba76400d03b8bcb4942b0 (diff) | |
download | op-kernel-dev-14ff3e78304e3f7fe18f950c3aa0686e6800b3fb.zip op-kernel-dev-14ff3e78304e3f7fe18f950c3aa0686e6800b3fb.tar.gz |
ALSA: dt019x: merge into the als100 driver
The als100 driver is so similar to the dt019x/als007 driver
that one driver's source can be used for both drivers with
only few changes. Merge the dt019x driver into the als100.
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/Kconfig')
-rw-r--r-- | sound/isa/Kconfig | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig index 02fe81c..194af3b0 100644 --- a/sound/isa/Kconfig +++ b/sound/isa/Kconfig @@ -63,15 +63,16 @@ config SND_AD1848 will be called snd-ad1848. config SND_ALS100 - tristate "Avance Logic ALS100/ALS120" + tristate "Diamond Tech. DT-019x and Avance Logic ALSxxx" depends on PNP select ISAPNP select SND_OPL3_LIB select SND_MPU401_UART select SND_SB16_DSP help - Say Y here to include support for soundcards based on Avance - Logic ALS100, ALS110, ALS120 and ALS200 chips. + Say Y here to include support for soundcards based on the + Diamond Technologies DT-019X or Avance Logic chips: ALS007, + ALS100, ALS110, ALS120 and ALS200 chips. To compile this driver as a module, choose M here: the module will be called snd-als100. @@ -127,20 +128,6 @@ config SND_CS4236 To compile this driver as a module, choose M here: the module will be called snd-cs4236. -config SND_DT019X - tristate "Diamond Technologies DT-019X, Avance Logic ALS-007" - depends on PNP - select ISAPNP - select SND_OPL3_LIB - select SND_MPU401_UART - select SND_SB16_DSP - help - Say Y here to include support for soundcards based on the - Diamond Technologies DT-019X or Avance Logic ALS-007 chips. - - To compile this driver as a module, choose M here: the module - will be called snd-dt019x. - config SND_ES968 tristate "Generic ESS ES968 driver" depends on PNP |