rpms/kernel/F-11 linux-2.6.29-alsa-update-quirks.patch,1.1,1.2

Matthew Garrett mjg59 at fedoraproject.org
Wed Apr 1 03:24:03 UTC 2009


Author: mjg59

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16012

Modified Files:
	linux-2.6.29-alsa-update-quirks.patch 
Log Message:
The right version of the diff, this time.


linux-2.6.29-alsa-update-quirks.patch:

Index: linux-2.6.29-alsa-update-quirks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6.29-alsa-update-quirks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6.29-alsa-update-quirks.patch	1 Apr 2009 00:24:57 -0000	1.1
+++ linux-2.6.29-alsa-update-quirks.patch	1 Apr 2009 03:24:02 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up ./include/sound/core.h.alsa ./include/sound/core.h
---- ./include/sound/core.h.alsa	2009-04-01 00:47:41.000000000 +0100
-+++ ./include/sound/core.h	2009-04-01 00:47:43.000000000 +0100
+diff -up linux-2.6.29.noarch/include/sound/core.h.alsa linux-2.6.29.noarch/include/sound/core.h
+--- linux-2.6.29.noarch/include/sound/core.h.alsa	2009-04-01 04:21:47.000000000 +0100
++++ linux-2.6.29.noarch/include/sound/core.h	2009-04-01 04:22:00.000000000 +0100
 @@ -446,21 +446,33 @@ static inline int __snd_bug_on(int cond)
  struct snd_pci_quirk {
  	unsigned short subvendor;	/* PCI subvendor ID */
@@ -37,9 +37,9 @@
  #endif
  
  const struct snd_pci_quirk *
-diff -up ./sound/core/misc.c.alsa ./sound/core/misc.c
---- ./sound/core/misc.c.alsa	2009-04-01 00:47:41.000000000 +0100
-+++ ./sound/core/misc.c	2009-04-01 00:47:43.000000000 +0100
+diff -up linux-2.6.29.noarch/sound/core/misc.c.alsa linux-2.6.29.noarch/sound/core/misc.c
+--- linux-2.6.29.noarch/sound/core/misc.c.alsa	2009-04-01 04:21:47.000000000 +0100
++++ linux-2.6.29.noarch/sound/core/misc.c	2009-04-01 04:22:00.000000000 +0100
 @@ -95,12 +95,14 @@ snd_pci_quirk_lookup(struct pci_dev *pci
  {
  	const struct snd_pci_quirk *q;
@@ -59,9 +59,9 @@
 -
  EXPORT_SYMBOL(snd_pci_quirk_lookup);
  #endif
-diff -up ./sound/pci/hda/patch_analog.c.alsa ./sound/pci/hda/patch_analog.c
---- ./sound/pci/hda/patch_analog.c.alsa	2009-03-23 23:12:14.000000000 +0000
-+++ ./sound/pci/hda/patch_analog.c	2009-04-01 00:52:49.000000000 +0100
+diff -up linux-2.6.29.noarch/sound/pci/hda/patch_analog.c.alsa linux-2.6.29.noarch/sound/pci/hda/patch_analog.c
+--- linux-2.6.29.noarch/sound/pci/hda/patch_analog.c.alsa	2009-04-01 04:21:47.000000000 +0100
++++ linux-2.6.29.noarch/sound/pci/hda/patch_analog.c	2009-04-01 04:22:00.000000000 +0100
 @@ -1002,11 +1002,9 @@ static struct snd_pci_quirk ad1986a_cfg_
  	SND_PCI_QUIRK(0x1179, 0xff40, "Toshiba", AD1986A_LAPTOP_EAPD),
  	SND_PCI_QUIRK(0x144d, 0xb03c, "Samsung R55", AD1986A_3STACK),
@@ -89,9 +89,9 @@
  	SND_PCI_QUIRK(0x103c, 0x3614, "HP 6730s", AD1884A_LAPTOP),
  	SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X300", AD1884A_THINKPAD),
  	{}
-diff -up ./sound/pci/hda/patch_conexant.c.alsa ./sound/pci/hda/patch_conexant.c
---- ./sound/pci/hda/patch_conexant.c.alsa	2009-04-01 00:53:24.000000000 +0100
-+++ ./sound/pci/hda/patch_conexant.c	2009-04-01 00:54:34.000000000 +0100
+diff -up linux-2.6.29.noarch/sound/pci/hda/patch_conexant.c.alsa linux-2.6.29.noarch/sound/pci/hda/patch_conexant.c
+--- linux-2.6.29.noarch/sound/pci/hda/patch_conexant.c.alsa	2009-04-01 04:21:47.000000000 +0100
++++ linux-2.6.29.noarch/sound/pci/hda/patch_conexant.c	2009-04-01 04:22:00.000000000 +0100
 @@ -1002,15 +1002,9 @@ static const char *cxt5045_models[CXT504
  };
  
@@ -121,9 +121,9 @@
  	SND_PCI_QUIRK(0x8086, 0x2111, "Conexant Reference board", CXT5045_LAPTOP_HPSENSE),
  	{}
  };
-diff -up ./sound/pci/hda/patch_realtek.c.alsa ./sound/pci/hda/patch_realtek.c
---- ./sound/pci/hda/patch_realtek.c.alsa	2009-04-01 00:54:47.000000000 +0100
-+++ ./sound/pci/hda/patch_realtek.c	2009-04-01 00:57:42.000000000 +0100
+diff -up linux-2.6.29.noarch/sound/pci/hda/patch_realtek.c.alsa linux-2.6.29.noarch/sound/pci/hda/patch_realtek.c
+--- linux-2.6.29.noarch/sound/pci/hda/patch_realtek.c.alsa	2009-04-01 04:21:47.000000000 +0100
++++ linux-2.6.29.noarch/sound/pci/hda/patch_realtek.c	2009-04-01 04:22:13.000000000 +0100
 @@ -10549,15 +10549,12 @@ static const char *alc262_models[ALC262_
  static struct snd_pci_quirk alc262_cfg_tbl[] = {
  	SND_PCI_QUIRK(0x1002, 0x437b, "Hippo", ALC262_HIPPO),
@@ -146,7 +146,7 @@
  	SND_PCI_QUIRK(0x103c, 0x2800, "HP D7000", ALC262_HP_BPC_D7000_WL),
  	SND_PCI_QUIRK(0x103c, 0x2801, "HP D7000", ALC262_HP_BPC_D7000_WF),
  	SND_PCI_QUIRK(0x103c, 0x2802, "HP D7000", ALC262_HP_BPC_D7000_WL),
-@@ -10575,17 +10572,17 @@ static struct snd_pci_quirk alc262_cfg_t
+@@ -10575,17 +10572,16 @@ static struct snd_pci_quirk alc262_cfg_t
  	SND_PCI_QUIRK(0x104d, 0x1f00, "Sony ASSAMD", ALC262_SONY_ASSAMD),
  	SND_PCI_QUIRK(0x104d, 0x8203, "Sony UX-90", ALC262_HIPPO),
  	SND_PCI_QUIRK(0x104d, 0x820f, "Sony ASSAMD", ALC262_SONY_ASSAMD),
@@ -164,13 +164,12 @@
  	SND_PCI_QUIRK(0x10cf, 0x142d, "Fujitsu Lifebook E8410", ALC262_FUJITSU),
 -	SND_PCI_QUIRK(0x144d, 0xc032, "Samsung Q1 Ultra", ALC262_ULTRA),
 -	SND_PCI_QUIRK(0x144d, 0xc039, "Samsung Q1U EL", ALC262_ULTRA),
-+        SND_PCI_QUIRK(0x10f1, 0x2915, "Tyan Thunder n6650W", ALC262_TYAN),
 +        SND_PCI_QUIRK_MASK(0x144d, 0xff00, 0xc032, "Samsung Q1",
 +			   ALC262_ULTRA),
  	SND_PCI_QUIRK(0x144d, 0xc510, "Samsung Q45", ALC262_HIPPO),
  	SND_PCI_QUIRK(0x17aa, 0x384e, "Lenovo 3000 y410", ALC262_LENOVO_3000),
  	SND_PCI_QUIRK(0x17ff, 0x0560, "Benq ED8", ALC262_BENQ_ED8),
-@@ -16039,9 +16036,8 @@ static struct snd_pci_quirk alc662_cfg_t
+@@ -16039,9 +16035,8 @@ static struct snd_pci_quirk alc662_cfg_t
  	SND_PCI_QUIRK(0x1565, 0x820f, "Biostar TA780G M2+", ALC662_3ST_6ch_DIG),
  	SND_PCI_QUIRK(0x1849, 0x3662, "ASROCK K10N78FullHD-hSLI R3.0",
  					ALC662_3ST_6ch_DIG),
@@ -182,9 +181,9 @@
  	{}
  };
  
-diff -up ./sound/pci/hda/patch_sigmatel.c.alsa ./sound/pci/hda/patch_sigmatel.c
---- ./sound/pci/hda/patch_sigmatel.c.alsa	2009-04-01 00:57:52.000000000 +0100
-+++ ./sound/pci/hda/patch_sigmatel.c	2009-04-01 01:00:53.000000000 +0100
+diff -up linux-2.6.29.noarch/sound/pci/hda/patch_sigmatel.c.alsa linux-2.6.29.noarch/sound/pci/hda/patch_sigmatel.c
+--- linux-2.6.29.noarch/sound/pci/hda/patch_sigmatel.c.alsa	2009-04-01 04:21:47.000000000 +0100
++++ linux-2.6.29.noarch/sound/pci/hda/patch_sigmatel.c	2009-04-01 04:22:00.000000000 +0100
 @@ -1796,18 +1796,12 @@ static struct snd_pci_quirk stac92hd71bx
  	/* SigmaTel reference board */
  	SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,




More information about the scm-commits mailing list