From b1213fa5705cf32385e201615d892c5975a511d5 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 28 Nov 2006 17:18:25 +0100
Subject: [PATCH] --- yaml --- r: 47135 b: refs/heads/master c:
 6c5cfd9d9d312b279adf9226b7e664f6f4c4cfc7 h: refs/heads/master i:   47133:
 e0cb38392e35cac27519bdd0dc9001e3d6225f86   47131:
 7f6e81dbad5dedcfb5c536a27ad34b080df677e5   47127:
 75defc2d5e4fb74a650bec24d598864f4c4f7293   47119:
 b19bde4382d684affb3e04436aa948bb7f4942e6   47103:
 4cb26064cdaad23649f9f03e150725ea07137faf v: v3

---
 [refs]                                                | 2 +-
 trunk/Documentation/sound/alsa/ALSA-Configuration.txt | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ee5febd7dbd7..ad4f33ab3eb3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9c96cf35b70b484483446c92f27652f3aef977e
+refs/heads/master: 6c5cfd9d9d312b279adf9226b7e664f6f4c4cfc7
diff --git a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt
index 15d102a94619..89b612f835ad 100644
--- a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -1079,6 +1079,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     buggy_semaphore - Enable workaround for hardwares with buggy
 		    semaphores (e.g. on some ASUS laptops)
 		    (default off)
+    spdif_aclink  - Use S/PDIF over AC-link instead of direct connection
+		    from the controller chip
+		    (0 = off, 1 = on, -1 = default)
 
     This module supports one chip and autoprobe.