diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
| commit | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (patch) | |
| tree | c9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9 /sound/pci/hda/patch_realtek.c | |
| parent | 0415b00d175e0d8945e6785aad21b5f157976ce0 (diff) | |
| parent | 6ea0c34dac89611126455537552cffe6c7e832ad (diff) | |
Merge branch 'fixes-2.6.39' into for-2.6.40
Diffstat (limited to 'sound/pci/hda/patch_realtek.c')
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 5d582de91c1..0ef0035fe99 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
| @@ -1290,7 +1290,7 @@ static void alc_auto_init_amp(struct hda_codec *codec, int type) | |||
| 1290 | case 0x10ec0883: | 1290 | case 0x10ec0883: |
| 1291 | case 0x10ec0885: | 1291 | case 0x10ec0885: |
| 1292 | case 0x10ec0887: | 1292 | case 0x10ec0887: |
| 1293 | case 0x10ec0889: | 1293 | /*case 0x10ec0889:*/ /* this causes an SPDIF problem */ |
| 1294 | alc889_coef_init(codec); | 1294 | alc889_coef_init(codec); |
| 1295 | break; | 1295 | break; |
| 1296 | case 0x10ec0888: | 1296 | case 0x10ec0888: |