diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-04 12:39:12 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-04 12:39:12 -0500 |
| commit | 9dfea1b46d9f147478ccdfa4a4ef472fdc98d6dd (patch) | |
| tree | 4338700a76ef4f79142048b9363adff55575bc1f /sound/pci/hda/patch_realtek.c | |
| parent | eda58a85ec3fc05855a26654d97a2b53f0e715b9 (diff) | |
| parent | 7df0eb424d7f5bfb948c921500e0470f4a27c4cb (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: pcm_oss: AFMT_S24_LE is set twice in return value
ALSA: ASoC: email - update email addresses.
OMAP: ASoC: Fix spinlock misuse in omap-pcm.c
ALSA: hda - No widget selection for volume knob widgets in proc output
ALSA: hda - Add support of iMac 24 Aluminium
ALSA: alsa: time reaches -1, tested 0
ALSA: hda - Add quirk for another HP dv5 model
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) | |||
| 7012 | break; | 7012 | break; |
| 7013 | case 0x106b1000: /* iMac 24 */ | 7013 | case 0x106b1000: /* iMac 24 */ |
| 7014 | case 0x106b2800: /* AppleTV */ | 7014 | case 0x106b2800: /* AppleTV */ |
| 7015 | case 0x106b3e00: /* iMac 24 Aluminium */ | ||
| 7015 | board_config = ALC885_IMAC24; | 7016 | board_config = ALC885_IMAC24; |
| 7016 | break; | 7017 | break; |
| 7017 | case 0x106b00a1: /* Macbook (might be wrong - PCI SSID?) */ | 7018 | case 0x106b00a1: /* Macbook (might be wrong - PCI SSID?) */ |