From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 7 Nov 2008 08:06:05 +0000 (+0100)
Subject: Merge branch 'topic/fix/misc' into topic/misc
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=63cf123bf5d538a066e4a899390c9ce56ab6df9f;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge branch 'topic/fix/misc' into topic/misc
---

63cf123bf5d538a066e4a899390c9ce56ab6df9f
diff --cc sound/pci/emu10k1/emu10k1_main.c
index dee7ebabccee,de5ee8f097f6..7958006a1d66
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@@ -1470,18 -1464,20 +1470,20 @@@ static struct snd_emu_chip_details emu_
  	 .ca0151_chip = 1,
  	 .spk71 = 1,
  	 .spdif_bug = 1,
+ 	 .invert_shared_spdif = 1,	/* digital/analog switch swapped */
  	 .ac97_chip = 1} ,
  	{.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20021102,
 -	 .driver = "Audigy2", .name = "Audigy 2 ZS [SB0350]", 
 +	 .driver = "Audigy2", .name = "SB Audigy 2 ZS [SB0350]",
  	 .id = "Audigy2",
  	 .emu10k2_chip = 1,
  	 .ca0102_chip = 1,
  	 .ca0151_chip = 1,
  	 .spk71 = 1,
  	 .spdif_bug = 1,
+ 	 .invert_shared_spdif = 1,	/* digital/analog switch swapped */
  	 .ac97_chip = 1} ,
  	{.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20011102,
 -	 .driver = "Audigy2", .name = "Audigy 2 ZS [2001]", 
 +	 .driver = "Audigy2", .name = "SB Audigy 2 ZS [SB0360]",
  	 .id = "Audigy2",
  	 .emu10k2_chip = 1,
  	 .ca0102_chip = 1,