diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-02-04 18:19:07 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-02-04 18:19:07 +0100 |
commit | af7af690397296b663c8bc152a5f79f32abcef24 (patch) | |
tree | 6628327a0cbe8680ba2fac5a0480cebdb7c418fa /sound/pci/hda/patch_realtek.c | |
parent | ALSA: pcm_oss: AFMT_S24_LE is set twice in return value (diff) | |
parent | ALSA: hda - No widget selection for volume knob widgets in proc output (diff) | |
download | linux-af7af690397296b663c8bc152a5f79f32abcef24.tar.xz linux-af7af690397296b663c8bc152a5f79f32abcef24.zip |
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/patch_realtek.c')
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 7884a4e07061..0040101f6150 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -7012,6 +7012,7 @@ static int patch_alc882(struct hda_codec *codec) break; case 0x106b1000: /* iMac 24 */ case 0x106b2800: /* AppleTV */ + case 0x106b3e00: /* iMac 24 Aluminium */ board_config = ALC885_IMAC24; break; case 0x106b00a1: /* Macbook (might be wrong - PCI SSID?) */ |