---

yaml
---
r: 175690
b: refs/heads/master
c: 761c9d4
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcfdebe70759c74e2e701f69aaa7f0e5e32cf5a6
+refs/heads/master: 761c9d45d14e0afa3c0b8eb84b4075602e50533b

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 Hudson-2
+  * AMD SB900
     Datasheet: Not publicly available
   * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge
     Datasheet: Publicly available at the SMSC website http://www.smsc.com

trunk/Documentation/sound/alsa/ALSA-Configuration.txt

@@ -798,9 +798,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     		setup before initializing the codecs.  This option is
 		available only when CONFIG_SND_HDA_PATCH_LOADER=y is set.
 		See HD-Audio.txt for details.
-    beep_mode	- Selects the beep registration mode (0=off, 1=on, 2=
-		dynamic registration via mute switch on/off); the default
-		value is set via CONFIG_SND_HDA_INPUT_BEEP_MODE kconfig.
 
     [Single (global) options]
     single_cmd  - Use single immediate commands to communicate with
@@ -1457,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
@@ -1635,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)
   --------------------------------------

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

trunk/Documentation/sound/alsa/HD-Audio-Models.txt

@@ -126,7 +126,6 @@ ALC882/883/885/888/889
   mb5		Macbook 5,1
   mbp3		Macbook Pro rev3
   imac24	iMac 24'' with jack detection
-  imac91	iMac 9,1
   w2jc		ASUS W2JC
   3stack-2ch-dig	3-jack with SPDIF I/O (ALC883)
   alc883-6stack-dig	6-jack digital with SPDIF I/O (ALC883)
@@ -392,7 +391,6 @@ STAC92HD83*
   ref		Reference board
   mic-ref	Reference board with power management for ports
   dell-s14	Dell laptop
-  hp		HP laptops with (inverted) mute-LED
   auto		BIOS setup (default)
 
 STAC9872

trunk/Documentation/sound/alsa/HD-Audio.txt

@@ -624,13 +624,11 @@ hda-verb.  The program gives you an easy-to-use GUI stuff for showing
 the widget information and adjusting the amp values, as well as the
 proc-compatible output.
 
-The hda-analyzer:
+The hda-analyzer is a part of alsa.git repository in
+alsa-project.org:
 
 - http://git.alsa-project.org/?p=alsa.git;a=tree;f=hda-analyzer
 
-is a part of alsa.git repository in alsa-project.org:
-
-- git://git.alsa-project.org/alsa.git
 
 Codecgraph
 ~~~~~~~~~~