diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-05-20 09:59:29 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-20 09:59:29 (GMT) |
| commit | 5e8aa85253513b9c1ade8bd71dc341218a752a65 (patch) | |
| tree | 84240b7f72fefb805c78300de0ae23b7b96bf5c2 /sound/isa/Kconfig | |
| parent | 7bd9db83087aecef8279c0b8b9dfef4db4a8fc3c (diff) | |
| parent | 550a8b691ca67761bbf382d98fbd81d215f1d7f0 (diff) | |
| download | linux-5e8aa85253513b9c1ade8bd71dc341218a752a65.tar.xz | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/isa/Kconfig')
| -rw-r--r-- | sound/isa/Kconfig | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig index 755a0a5..c6990c6 100644 --- a/sound/isa/Kconfig +++ b/sound/isa/Kconfig @@ -128,26 +128,14 @@ config SND_CS4236 To compile this driver as a module, choose M here: the module will be called snd-cs4236. -config SND_ES968 - tristate "Generic ESS ES968 driver" - depends on PNP - select ISAPNP - select SND_MPU401_UART - select SND_SB8_DSP - help - Say Y here to include support for ESS AudioDrive ES968 chips. - - To compile this driver as a module, choose M here: the module - will be called snd-es968. - config SND_ES1688 - tristate "Generic ESS ES688/ES1688 driver" + tristate "Generic ESS ES688/ES1688 and ES968 PnP driver" select SND_OPL3_LIB select SND_MPU401_UART select SND_PCM help Say Y here to include support for ESS AudioDrive ES688 or - ES1688 chips. + ES1688 chips. Also, this module support cards with ES968 PnP chip. To compile this driver as a module, choose M here: the module will be called snd-es1688. |