diff options
author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
---|---|---|
committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /sound/isa/Kconfig | |
parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'sound/isa/Kconfig')
-rw-r--r-- | sound/isa/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig index 4a6be966bd9f..3a3228b18726 100644 --- a/sound/isa/Kconfig +++ b/sound/isa/Kconfig | |||
@@ -164,6 +164,7 @@ config SND_INTERWAVE | |||
164 | select SND_RAWMIDI | 164 | select SND_RAWMIDI |
165 | select SND_CS4231_LIB | 165 | select SND_CS4231_LIB |
166 | select SND_GUS_SYNTH | 166 | select SND_GUS_SYNTH |
167 | select ISAPNP | ||
167 | help | 168 | help |
168 | Say Y here to include support for AMD InterWave based | 169 | Say Y here to include support for AMD InterWave based |
169 | soundcards (Gravis UltraSound Plug & Play, STB SoundRage32, | 170 | soundcards (Gravis UltraSound Plug & Play, STB SoundRage32, |