Update of /cvsroot/gc-linux/linux/sound/ppc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1118/sound/ppc
Modified Files:
Kconfig
Log Message:
Merge 2.6.14
Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/sound/ppc/Kconfig,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Kconfig 23 Jun 2005 20:02:22 -0000 1.8
+++ Kconfig 31 Oct 2005 00:31:02 -0000 1.9
@@ -13,18 +13,32 @@
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.
+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.
+
config SND_GAMECUBE
tristate "Nintendo GameCube audio"
depends on SND
+# select SND_GENERIC_DRIVER
help
Say 'Y' or 'M' to include support for the Nintendo GameCube
audio system.
endmenu
-
|
