Merge branch 'srp' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[linux-2.6] / sound / ppc / Kconfig

diff --git a/sound/ppc/Kconfig b/sound/ppc/Kconfig
index b0a9ebf8bf3bba75dc88f56fc1d56c2f37698761..206b9333f91f437d442d8f254aba311d782fadb0 100644 (file)
--- a/sound/ppc/Kconfig
+++ b/sound/ppc/Kconfig
@@ -11,13 +11,26 @@ comment "ALSA PowerMac requires INPUT"
 
 config SND_POWERMAC
        tristate "PowerMac (AWACS, DACA, Burgundy, Tumbler, Keywest)"
-       depends on SND && I2C && INPUT
+       depends on SND && I2C && INPUT && PPC_PMAC
        select SND_PCM
+       select SND_GENERIC_DRIVER
        help
          Say Y here to include support for the integrated sound device.
 
          To compile this driver as a module, choose M here: the module
          will be called snd-powermac.
 
-endmenu
+config SND_POWERMAC_AUTO_DRC
+       bool "Toggle DRC automatically at headphone/line plug-in"
+       depends on SND_POWERMAC
+       default y
+       help
+         Say Y here to enable the automatic toggle of DRC (dynamic
+         range compression) on Tumbler/Snapper.
+         If this feature is enabled, DRC is turned off when the
+         headphone/line jack is plugged, and turned on when unplugged.
 
+         Note that you can turn on/off DRC manually even without this
+         option.
+
+endmenu