vserver 2.0 rc7

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

diff --git a/sound/core/Kconfig b/sound/core/Kconfig
index e0dd38a..d1e800b 100644 (file)
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -1,16 +1,20 @@
 # ALSA soundcard-configuration
 config SND_TIMER
        tristate
+       depends on SND
 
 config SND_PCM
        tristate
        select SND_TIMER
+       depends on SND
 
 config SND_HWDEP
        tristate
+       depends on SND
 
 config SND_RAWMIDI
        tristate
+       depends on SND
 
 config SND_SEQUENCER
        tristate "Sequencer support"
@@ -40,6 +44,7 @@ config SND_SEQ_DUMMY
 
 config SND_OSSEMUL
        bool
+       depends on SND
 
 config SND_MIXER_OSS
        tristate "OSS Mixer API"
@@ -70,7 +75,7 @@ config SND_PCM_OSS
 
 config SND_SEQUENCER_OSS
        bool "OSS Sequencer API"
-       depends on SND_SEQUENCER
+       depends on SND && SND_SEQUENCER
        select SND_OSSEMUL
        help
          Say Y here to enable OSS sequencer emulation (both
@@ -81,20 +86,6 @@ config SND_SEQUENCER_OSS
          To compile this driver as a module, choose M here: the module
          will be called snd-seq-oss.
 
-config SND_BIT32_EMUL
-       tristate "Emulation for 32-bit applications"
-       depends on SND && COMPAT
-       select SND_PCM
-       select SND_RAWMIDI
-       select SND_TIMER
-       select SND_HWDEP
-       help
-         Say Y here to enable the emulation for 32-bit ALSA-native
-         applications.
-
-         To compile this driver as a module, choose M here: the module
-         will be called snd-ioctl32.
-
 config SND_RTCTIMER
        tristate "RTC Timer support"
        depends on SND && RTC
@@ -137,3 +128,6 @@ config SND_DEBUG_DETECT
          Say Y here to enable extra-verbose log messages printed when
          detecting devices.
 
+config SND_GENERIC_PM
+       bool
+       depends on SND