summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-10-22 12:25:19 +0200
committerTakashi Iwai <tiwai@suse.de>2014-10-22 12:25:19 +0200
commit4f96c6d10754130205aadec60442169147177b75 (patch)
tree1f91fe7cf942b874408698013603ac5fedd72fc4
parent870ba597a3efac91d4dd8603d9c228f262603728 (diff)
parentb26fb9b0be6403818f46f5d0c1e0c88f6bea05d0 (diff)
downloadalsa-driver-build-unstable-4f96c6d10754130205aadec60442169147177b75.tar.gz
Merge remote-tracking branch 'stable/build' into build
-rw-r--r--alsa/pci/au88x0/au88x0.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/alsa/pci/au88x0/au88x0.patch b/alsa/pci/au88x0/au88x0.patch
index 4f622fa05..7453b3c03 100644
--- a/alsa/pci/au88x0/au88x0.patch
+++ b/alsa/pci/au88x0/au88x0.patch
@@ -1,5 +1,5 @@
---- ../../alsa-kernel/pci/au88x0/au88x0.c 2007-07-19 16:36:25.000000000 +0200
-+++ au88x0.c 2007-07-20 12:42:47.000000000 +0200
+--- ../../alsa-kernel/pci/au88x0/au88x0.c 2014-10-20 08:00:46.676007856 +0200
++++ au88x0.c 2014-10-22 12:21:41.021882073 +0200
@@ -14,7 +14,7 @@
* Now at least i can play Legacy DOOM with MIDI music :-)
*/
@@ -9,7 +9,7 @@
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/slab.h>
-@@ -341,7 +341,7 @@
+@@ -338,7 +338,7 @@
snd_card_free(card);
return err;
}
@@ -17,4 +17,4 @@
+ chip->rev = snd_pci_revision(pci);
#ifdef CHIP_AU8830
if ((chip->rev) != 0xfe && (chip->rev) != 0xfa) {
- printk(KERN_ALERT
+ dev_alert(card->dev,