diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-16 15:13:45 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-03-16 15:13:45 +0100 |
| commit | 03c3060cfb72cda2feb507660a4cc9d6a8b7152f (patch) | |
| tree | c2031308efc2c7268daad7aad1adc2c004dff71a | |
| parent | 4f221f11704b5b56e9734df69cf535d1675b0c7d (diff) | |
| parent | 0d8d4e8a71596a7f4cc7ef63592e68ec36d52663 (diff) | |
| download | alsa-driver-build-unstable-03c3060cfb72cda2feb507660a4cc9d6a8b7152f.tar.gz | |
Merge remote-tracking branch 'stable/build' into build
| -rw-r--r-- | alsa/pci/hda/hda_beep.patch | 14 | ||||
| -rw-r--r-- | alsa/pci/hda/hda_bind.c | 2 | ||||
| -rwxr-xr-x | alsa/utils/patch-alsa | 4 |
3 files changed, 9 insertions, 11 deletions
diff --git a/alsa/pci/hda/hda_beep.patch b/alsa/pci/hda/hda_beep.patch index db153f468..06341a34c 100644 --- a/alsa/pci/hda/hda_beep.patch +++ b/alsa/pci/hda/hda_beep.patch @@ -1,5 +1,5 @@ ---- ../../alsa-kernel/pci/hda/hda_beep.c 2014-02-28 14:04:36.379083709 +0100 -+++ hda_beep.c 2014-02-28 14:06:26.879910159 +0100 +--- ../../alsa-kernel/pci/hda/hda_beep.c 2015-03-16 14:56:38.666616076 +0100 ++++ hda_beep.c 2015-03-16 15:06:17.428601095 +0100 @@ -1,3 +1,5 @@ +#define __NO_VERSION__ +#include "adriver.h" @@ -50,23 +50,19 @@ if (!input_dev) return -ENOMEM; -@@ -168,8 +183,15 @@ +@@ -169,7 +184,11 @@ input_dev->evbit[0] = BIT_MASK(EV_SND); input_dev->sndbit[0] = BIT_MASK(SND_BELL) | BIT_MASK(SND_TONE); input_dev->event = snd_hda_beep_event; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) - input_dev->dev.parent = &codec->dev; input_set_drvdata(input_dev, beep); +#else -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 15) -+ input_dev->cdev.dev = &codec->dev; -+#endif + input_dev->private = beep; +#endif /* 2.6.22 */ beep->dev = input_dev; return 0; -@@ -248,6 +270,7 @@ +@@ -275,6 +294,7 @@ if (!beep || !beep->dev) return 0; @@ -74,7 +70,7 @@ err = input_register_device(beep->dev); if (err < 0) { codec_err(codec, "hda_beep: unable to register input device\n"); -@@ -256,6 +279,9 @@ +@@ -283,6 +303,9 @@ kfree(beep); return err; } diff --git a/alsa/pci/hda/hda_bind.c b/alsa/pci/hda/hda_bind.c new file mode 100644 index 000000000..f72eaaa65 --- /dev/null +++ b/alsa/pci/hda/hda_bind.c @@ -0,0 +1,2 @@ +#include "adriver.h" +#include "../../alsa-kernel/pci/hda/hda_bind.c" diff --git a/alsa/utils/patch-alsa b/alsa/utils/patch-alsa index 32f86d1f0..9b7411baf 100755 --- a/alsa/utils/patch-alsa +++ b/alsa/utils/patch-alsa @@ -11,7 +11,7 @@ case $dst in xtmp=`dirname $dst | sed -e s@/acore@/core@ -e s@alsa-driver/@alsa-driver/alsa-kernel/@`/`basename $dst` echo copying file $xtmp cp -v $xtmp $dst || exit 1 - patch -p0 $dst $pat || { rm $dst; exit 1; } + patch $dst $pat || { rm $dst; exit 1; } ;; *) curd=`/bin/pwd` @@ -19,7 +19,7 @@ case $dst in xtmp=`echo $MODCURDIR | sed -e 's/^acore/core/'`/$dst echo copying file alsa-kernel/$xtmp cp $SND_TOPDIR/alsa-kernel/$xtmp $@ || exit 1 - patch -p0 -i $pat || { rm $dst; exit 1; } + patch -i $pat || { rm $dst; exit 1; } ;; esac exit 0 |