From 2505ae0dfa7d133cb3e652401b2592306624bde3 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 21 Nov 2011 14:17:16 +0100
Subject: [PATCH] --- yaml --- r: 284214 b: refs/heads/master c:
 d6018bb566f6eef277184278b105e04705e8aeb6 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/sound/pci/hda/hda_codec.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3b5d4af1f170..c52cffcb5344 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 201e06ffa9ef9b5265e636617f4fa20cd1490343
+refs/heads/master: d6018bb566f6eef277184278b105e04705e8aeb6
diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c
index e050f893bf75..b703e25b6241 100644
--- a/trunk/sound/pci/hda/hda_codec.c
+++ b/trunk/sound/pci/hda/hda_codec.c
@@ -5071,7 +5071,7 @@ static const char *check_output_sfx(hda_nid_t nid, const hda_nid_t *pins,
 				    int num_pins, int *indexp)
 {
 	static const char * const channel_sfx[] = {
-		" Front", " Surrount", " CLFE", " Side"
+		" Front", " Surround", " CLFE", " Side"
 	};
 	int i;