summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2006-06-28 13:59:50 +0200
committerJaroslav Kysela <perex@suse.cz>2006-06-28 19:31:31 +0200
commitc6feefd03ed12d89af591345fb9c26de7098764d (patch)
tree7d8bc48a2601358d72d2e7839b4b331ce36661a7 /sound
parentd91c4e8c63a61c2d9ec96fc6a9aa5a65d468befc (diff)
downloadlinux-3.10-c6feefd03ed12d89af591345fb9c26de7098764d.tar.gz
linux-3.10-c6feefd03ed12d89af591345fb9c26de7098764d.tar.bz2
linux-3.10-c6feefd03ed12d89af591345fb9c26de7098764d.zip
[ALSA] snd-aoa: support iMac G5 iSight
This properly adds support for the iMac G5 iSight. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound')
-rw-r--r--sound/aoa/fabrics/snd-aoa-fabric-layout.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/sound/aoa/fabrics/snd-aoa-fabric-layout.c b/sound/aoa/fabrics/snd-aoa-fabric-layout.c
index 04a7238e949..cbc8a3b5cea 100644
--- a/sound/aoa/fabrics/snd-aoa-fabric-layout.c
+++ b/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",