From 3adc348dbad1b5ee07e11552a34141f42e68c2e5 Mon Sep 17 00:00:00 2001
From: Tobin Davis <tdavis@dsl-only.net>
Date: Thu, 28 Dec 2006 13:55:41 +0100
Subject: [PATCH] --- yaml --- r: 47167 b: refs/heads/master c:
 518f6a6173e6009f5d380c638ea97a8897ebea9c h: refs/heads/master i:   47165:
 fc361ccf442b3cf36a532ec569c88eb91ca2af01   47163:
 585effce819ca3a99e3e716989b4e6ff235e949a   47159:
 1e3a4bf05788272892d738b395b682b811d2b613   47151:
 b7ae7c80ecad08fd8d3c6b84ae63e89c1f726653   47135:
 b1213fa5705cf32385e201615d892c5975a511d5   47103:
 4cb26064cdaad23649f9f03e150725ea07137faf v: v3

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

diff --git a/[refs] b/[refs]
index 6d25241ddfcf..2d8b09c23013 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88518275e3eefe0582af1918d59325b16dfde154
+refs/heads/master: 518f6a6173e6009f5d380c638ea97a8897ebea9c
diff --git a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt
index 89b612f835ad..14debd58c182 100644
--- a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -814,8 +814,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
 	ALC882/885
 	  3stack-dig	3-jack with SPDIF I/O
-	  6stck-dig	6-jack digital with SPDIF I/O
+	  6stack-dig	6-jack digital with SPDIF I/O
 	  arima		Arima W820Di1
+	  macpro	MacPro support
 	  auto		auto-config reading BIOS (default)
 
 	ALC883/888