From 6e8a044246537af729751ec0533fe365afdaa74d Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Wed, 28 Jun 2006 13:59:50 +0200
Subject: [PATCH] --- yaml --- r: 31215 b: refs/heads/master c:
 c6feefd03ed12d89af591345fb9c26de7098764d h: refs/heads/master i:   31213:
 c956ac0f4e25c3d8155b365bf9b911a34d52b918   31211:
 5eddef02e72f658fa6b4519b39b08984c1946b73   31207:
 148e2f7c42fcb862e730c1efb7b3e22692d12dc9   31199:
 02be9196bdc8c7216ed24394a23051d2f92a2b26 v: v3

---
 [refs]                                          |  2 +-
 trunk/sound/aoa/fabrics/snd-aoa-fabric-layout.c | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index dce06324ddc4..b5b9e28195e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d91c4e8c63a61c2d9ec96fc6a9aa5a65d468befc
+refs/heads/master: c6feefd03ed12d89af591345fb9c26de7098764d
diff --git a/trunk/sound/aoa/fabrics/snd-aoa-fabric-layout.c b/trunk/sound/aoa/fabrics/snd-aoa-fabric-layout.c
index 04a7238e9494..cbc8a3b5cea4 100644
--- a/trunk/sound/aoa/fabrics/snd-aoa-fabric-layout.c
+++ b/trunk/sound/aoa/fabrics/snd-aoa-fabric-layout.c
@@ -94,6 +94,7 @@ MODULE_ALIAS("sound-layout-82");
 MODULE_ALIAS("sound-layout-84");
 MODULE_ALIAS("sound-layout-86");
 MODULE_ALIAS("sound-layout-92");
+MODULE_ALIAS("sound-layout-96");
 
 /* onyx with all but microphone connected */
 static struct codec_connection onyx_connections_nomic[] = {
@@ -381,6 +382,13 @@ static struct layout layouts[] = {
 		.connections = toonie_connections,
 	  },
 	},
+	{
+	  .layout_id = 96,
+	  .codecs[0] = {
+	  	.name = "onyx",
+	  	.connections = onyx_connections_noheadphones,
+	  },
+	},
 	/* unknown, untested, but this comes from Apple */
 	{ .layout_id = 41,
 	  .codecs[0] = {
@@ -479,12 +487,6 @@ static struct layout layouts[] = {
 		.connections = onyx_connections_noheadphones,
 	  },
 	},
-	{ .layout_id = 96,
-	  .codecs[0] = {
-		.name = "onyx",
-		.connections = onyx_connections_noheadphones,
-	  },
-	},
 	{ .layout_id = 98,
 	  .codecs[0] = {
 		.name = "toonie",