Merge ../linus

[linux-2.6] / sound / ppc / Kconfig

diff --git a/sound/ppc/Kconfig b/sound/ppc/Kconfig
index bda5bc4e6148b39cf4395b8ee58a59dfe47ec53a..a3fb1496e4dc797609d0186af5d4ba5ae2b696ef 100644 (file)
--- a/sound/ppc/Kconfig
+++ b/sound/ppc/Kconfig
@@ -13,12 +13,23 @@ config SND_POWERMAC
        tristate "PowerMac (AWACS, DACA, Burgundy, Tumbler, Keywest)"
        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