r2507 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series

[Joshua Kwan]

Author: joshk
Date: 2005-02-17 20:15:44 +0100 (Thu, 17 Feb 2005)
New Revision: 2507

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/au88x0-use-short-name.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-14
Log:
add au88x0-use-short-name.dpatch from 2.6.9

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-02-17 09:57:31 UTC (rev 2506)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-02-17 19:15:44 UTC (rev 2507)
@@ -27,12 +27,16 @@
   * sparc64-nis-killer.dpatch: patch that fixes some compatibility functions
     that (as a side effect) caused NIS to flatten a sparc64 machine.
     closes: #295626 (Joshua Kwan)
-  
+
   * Turn ifeq into a shell construct to allow things to still work if the orig
     tarball is unavailable. (Joshua Kwan)
 
- -- Joshua Kwan <joshk@triplehelix.org>  Thu, 17 Feb 2005 01:56:59 -0800
+  * au88x0-use-short-name.dpatch: Use CARD_SHORT_NAME in au88x0.c to allow
+    card-specific driver names (CARD_SHORT_NAME is redefined by each driver.)
+    (Joshua Kwan)
 
+ -- Joshua Kwan <joshk@triplehelix.org>  Thu, 17 Feb 2005 11:15:10 -0800
+
 kernel-source-2.6.8 (2.6.8-13) unstable; urgency=high
 
   * add more USB card reader blacklist entries.  Patch from Fedora via

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/au88x0-use-short-name.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/au88x0-use-short-name.dpatch	2005-02-17 09:57:31 UTC (rev 2506)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/au88x0-use-short-name.dpatch	2005-02-17 19:15:44 UTC (rev 2507)
@@ -0,0 +1,39 @@
+# origin: bk
+# cset: 1.1832.77.45 (linux-2.6)
+# inclusion: 2.6.10
+# description: allow unique driver name for au88x0 cards with CARD_SHORT_NAME
+# revision date: 2005-01-21
+
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2004/09/22 09:55:28+02:00 perex@suse.cz 
+#   [ALSA]  use card-specific driver name
+#   
+#   au88x0 driver
+#   use CARD_NAME_SHORT as driver name to allow different configuration file aliases in alsa-lib
+#   
+#   Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
+# 
+# sound/pci/au88x0/au88x0.c
+#   2004/09/22 02:11:15+02:00 perex@suse.cz +1 -1
+#   [ALSA]  use card-specific driver name
+#   
+#   D:2004/09/22 08:11:15
+#   C:au88x0 driver
+#   F:pci/au88x0/au88x0.c:1.12->1.13 
+#   L:use CARD_NAME_SHORT as driver name to allow different configuration file aliases in alsa-lib
+#   Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
+# 
+diff -Nru a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
+--- a/sound/pci/au88x0/au88x0.c	2005-01-21 02:12:49 -08:00
++++ b/sound/pci/au88x0/au88x0.c	2005-01-21 02:12:49 -08:00
+@@ -316,7 +316,7 @@
+ #endif
+ 
+ 	// (5)
+-	strcpy(card->driver, "Aureal Vortex");
++	strcpy(card->driver, CARD_NAME_SHORT);
+ 	strcpy(card->shortname, CARD_NAME_SHORT);
+ 	sprintf(card->longname, "%s at 0x%lx irq %i",
+ 		card->shortname, chip->io, chip->irq);

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-14
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-14	2005-02-17 09:57:31 UTC (rev 2506)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-14	2005-02-17 19:15:44 UTC (rev 2507)
@@ -7,3 +7,4 @@
 + ia64-unwind-fix.dpatch
 + skb-reset-ip_summed.dpatch
 + sparc64-nis-killer.dpatch
++ au88x0-use-short-name.dpatch