VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / sound / isa / Kconfig

diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index 1f954b6..11b4240 100644 (file)
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -51,16 +51,6 @@ config SND_CS4236
          Say 'Y' or 'M' to include support for CS4235,CS4236,CS4237B,CS4238B,CS4239
          chips from Cirrus Logic - Crystal Semiconductors.
 
          Say 'Y' or 'M' to include support for CS4235,CS4236,CS4237B,CS4238B,CS4239
          chips from Cirrus Logic - Crystal Semiconductors.
 

-config SND_PC98_CS4232
-       tristate "NEC PC9800 CS4232 driver"
-       depends on SND && X86_PC9800
-       select SND_OPL3_LIB
-       select SND_MPU401_UART
-       select SND_PCM
-       help
-         Say 'Y' or 'M' to include support for NEC PC-9801/PC-9821 on-board
-         soundchip based on CS4232.
-

 config SND_ES968
        tristate "Generic ESS ES968 driver"
        depends on SND && ISAPNP
 config SND_ES968
        tristate "Generic ESS ES968 driver"
        depends on SND && ISAPNP


@@ -194,7 +184,7 @@ config SND_SBAWE
 
 config SND_SB16_CSP
        bool "Sound Blaster 16/AWE CSP support"
 
 config SND_SB16_CSP
        bool "Sound Blaster 16/AWE CSP support"

-       depends on SND_SB16 || SND_SBAWE
+       depends on (SND_SB16 || SND_SBAWE) && (BROKEN || !PPC)

        help
          Say 'Y' to include support for CSP core. This special coprocessor
          can do variable tasks like various compression and decompression
        help
          Say 'Y' to include support for CSP core. This special coprocessor
          can do variable tasks like various compression and decompression