From: Greg KH Date: Thu, 12 May 2005 18:36:47 +0000 (-0700) Subject: allow the sound patches to work with -p1 X-Git-Tag: v2.6.11.11~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5fa0d4251ceacb247a0539c51feae6f20169496d;p=thirdparty%2Fkernel%2Fstable-queue.git allow the sound patches to work with -p1 --- diff --git a/queue/usbaudio-prevent-oops-on-usb-unplug.patch b/queue/usbaudio-prevent-oops-on-usb-unplug.patch index 28034c6767e..3f6e3b647c1 100644 --- a/queue/usbaudio-prevent-oops-on-usb-unplug.patch +++ b/queue/usbaudio-prevent-oops-on-usb-unplug.patch @@ -20,9 +20,8 @@ Signed-off-by: Karsten Wiese Signed-off-by: Greg Kroah-Hartman -diff -u -r1.119 -r1.120 ---- sound/usb/usbaudio.c 2005/03/24 07:17:17 1.119 -+++ sound/usb/usbaudio.c 2005/04/20 09:12:35 1.120 +--- a/sound/usb/usbaudio.c 2005/03/24 07:17:17 1.119 ++++ b/sound/usb/usbaudio.c 2005/04/20 09:12:35 1.120 @@ -3289,7 +3289,7 @@ } usb_chip[chip->index] = NULL; diff --git a/queue/usbusx2y-prevent-oops-on-usb-unplug.patch b/queue/usbusx2y-prevent-oops-on-usb-unplug.patch index 690a5557e3a..fcf20f958ab 100644 --- a/queue/usbusx2y-prevent-oops-on-usb-unplug.patch +++ b/queue/usbusx2y-prevent-oops-on-usb-unplug.patch @@ -20,9 +20,8 @@ Signed-off-by: Karsten Wiese Signed-off-by: Greg Kroah-Hartman -diff -u -r1.9 -r1.10 ---- sound/usb/usx2y/usbusx2y.c 2005/01/28 10:21:48 1.9 -+++ sound/usb/usx2y/usbusx2y.c 2005/04/20 09:12:35 1.10 +--- a/sound/usb/usx2y/usbusx2y.c 2005/01/28 10:21:48 1.9 ++++ b/sound/usb/usx2y/usbusx2y.c 2005/04/20 09:12:35 1.10 @@ -1,6 +1,11 @@ /* * usbusy2y.c - ALSA USB US-428 Driver