---

yaml --- r: 170084 b: refs/heads/master c: 657b198 h: refs/heads/master v: v3
git-mirror · Nov 26, 2009 · 88267e0 · 88267e0
1 parent acc370d
commit 88267e0
Show file tree

Hide file tree

Showing 594 changed files with 11,001 additions and 6,116 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75639e7ee1401b3876c7a00ffe96ea8027668690
+refs/heads/master: 657b1989dacf58e83e7a76bca6d4a91a9f294cf6
diff --git a/trunk/Documentation/i2c/busses/i2c-piix4 b/trunk/Documentation/i2c/busses/i2c-piix4
@@ -8,7 +8,7 @@ Supported adapters:
     Datasheet: Only available via NDA from ServerWorks
   * ATI IXP200, IXP300, IXP400, SB600, SB700 and SB800 southbridges
     Datasheet: Not publicly available
-  * AMD SB900
+  * AMD Hudson-2
     Datasheet: Not publicly available
   * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge
     Datasheet: Publicly available at the SMSC website http://www.smsc.com

diff --git a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -1454,7 +1454,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
     Module for internal PC-Speaker.
 
-    nopcm	- Disable PC-Speaker PCM sound. Only beeps remain.
     nforce_wa	- enable NForce chipset workaround. Expect bad sound.
 
     This module supports system beeps, some kind of PCM playback and
@@ -1632,19 +1631,18 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
   Module snd-sscape
   -----------------
 
-    Module for ENSONIQ SoundScape cards.
+    Module for ENSONIQ SoundScape PnP cards.
 
     port	- Port # (PnP setup)
     wss_port	- WSS Port # (PnP setup)
     irq		- IRQ # (PnP setup)
     mpu_irq	- MPU-401 IRQ # (PnP setup)
     dma		- DMA # (PnP setup)
     dma2	- 2nd DMA # (PnP setup, -1 to disable)
-    joystick	- Enable gameport - 0 = disable (default), 1 = enable
-
-    This module supports multiple cards.
 
-    The driver requires the firmware loader support on kernel.
+    This module supports multiple cards.  ISA PnP must be enabled.
+    You need sscape_ctl tool in alsa-tools package for loading
+    the microcode.
 
   Module snd-sun-amd7930 (on sparc only)
   --------------------------------------

diff --git a/trunk/Documentation/sound/alsa/ControlNames.txt b/trunk/Documentation/sound/alsa/ControlNames.txt
@@ -18,9 +18,8 @@ SOURCE:
   Master
   Master Mono
   Hardware Master
-  Speaker	(internal speaker)
   Headphone
-  Beep		(beep generator)
+  PC Speaker
   Phone
   Phone Input
   Phone Output