diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
| commit | c9c06167e7933d93a6e396174c68abf242294abb (patch) | |
| tree | d9a8bb30663e9a3405a1ef37ffb62bc14b9f019f /drivers/sound/Config.in | |
| parent | f79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff) | |
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'drivers/sound/Config.in')
| -rw-r--r-- | drivers/sound/Config.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/sound/Config.in b/drivers/sound/Config.in index 929c9cf0f..9fd35efcb 100644 --- a/drivers/sound/Config.in +++ b/drivers/sound/Config.in @@ -142,7 +142,10 @@ if [ "$CONFIG_SOUND_OSS" = "y" -o "$CONFIG_SOUND_OSS" = "m" ]; then dep_tristate ' Yamaha FM synthesizer (YM3812/OPL-3) support' CONFIG_SOUND_YM3812 $CONFIG_SOUND_OSS dep_tristate ' Yamaha OPL3-SA1 audio controller' CONFIG_SOUND_OPL3SA1 $CONFIG_SOUND_OSS dep_tristate ' Yamaha OPL3-SA2, SA3, and SAx based PnP cards' CONFIG_SOUND_OPL3SA2 $CONFIG_SOUND_OSS - dep_tristate ' Yamaha PCI legacy mode support' CONFIG_SOUND_YMPCI $CONFIG_SOUND_OSS $CONFIG_PCI + dep_tristate ' Yamaha YMF7xx PCI audio (legacy mode)' CONFIG_SOUND_YMPCI $CONFIG_SOUND_OSS $CONFIG_PCI + if [ "$CONFIG_SOUND_YMPCI" = "n" ]; then + dep_tristate ' Yamaha YMF7xx PCI audio (native mode) (EXPERIMENTAL)' CONFIG_SOUND_YMFPCI $CONFIG_SOUND_OSS $CONFIG_PCI $CONFIG_EXPERIMENTAL + fi dep_tristate ' 6850 UART support' CONFIG_SOUND_UART6850 $CONFIG_SOUND_OSS dep_tristate ' Gallant Audio Cards (SC-6000 and SC-6600 based)' CONFIG_SOUND_AEDSP16 $CONFIG_SOUND_OSS |