ALSA: hda - Fix the cmd cache keys for amp verbs

[safe/jmp/linux-2.6] / sound / ppc / Kconfig

diff --git a/sound/ppc/Kconfig b/sound/ppc/Kconfig
index a3fb149..bd2338a 100644 (file)
--- a/sound/ppc/Kconfig
+++ b/sound/ppc/Kconfig
@@ -1,18 +1,19 @@
 # ALSA PowerMac drivers
 
-menu "ALSA PowerMac devices"
-       depends on SND!=n && PPC
-
-comment "ALSA PowerMac requires I2C"
-       depends on SND && I2C=n
+menuconfig SND_PPC
+       bool "PowerPC sound devices"
+       depends on PPC64 || PPC32
+       default y
+       help
+         Support for sound devices specific to PowerPC architectures.
 
-comment "ALSA PowerMac requires INPUT"
-       depends on SND && INPUT=n
+if SND_PPC
 
 config SND_POWERMAC
        tristate "PowerMac (AWACS, DACA, Burgundy, Tumbler, Keywest)"
-       depends on SND && I2C && INPUT && PPC_PMAC
+       depends on I2C && INPUT && PPC_PMAC
        select SND_PCM
+       select SND_VMASTER
        help
          Say Y here to include support for the integrated sound device.
 
@@ -32,4 +33,20 @@ config SND_POWERMAC_AUTO_DRC
          Note that you can turn on/off DRC manually even without this
          option.
 
-endmenu
+config SND_PS3
+       tristate "PS3 Audio support"
+       depends on PS3_PS3AV
+       select SND_PCM
+       default m
+       help
+         Say Y here to include support for audio on the PS3
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd_ps3.
+
+config SND_PS3_DEFAULT_START_DELAY
+       int "Startup delay time in ms"
+       depends on SND_PS3
+       default "2000"
+
+endif  # SND_PPC