aboutsummaryrefslogtreecommitdiffstats
path: root/usb
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-01-05 09:21:34 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-05 09:21:34 -0800
commit3c5bdf48c8d492dfdcbb3ac3a7c1242bd1a6e6e1 (patch)
treee442b9a742271bce0cf60901006a2a0cee63e0f9 /usb
parent7c5bb7c46c50b7a008ed3401c1d018dcd192d288 (diff)
downloadpatches-3c5bdf48c8d492dfdcbb3ac3a7c1242bd1a6e6e1.tar.gz
refresh for 2.6.15-git1
Diffstat (limited to 'usb')
-rw-r--r--usb/usb-remove-usb_audio-and-usb_midi-drivers.patch12
1 files changed, 5 insertions, 7 deletions
diff --git a/usb/usb-remove-usb_audio-and-usb_midi-drivers.patch b/usb/usb-remove-usb_audio-and-usb_midi-drivers.patch
index 7937d513af8107..cff9406ca6004b 100644
--- a/usb/usb-remove-usb_audio-and-usb_midi-drivers.patch
+++ b/usb/usb-remove-usb_audio-and-usb_midi-drivers.patch
@@ -17,11 +17,11 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/Makefile | 2
drivers/usb/class/Kconfig | 47
drivers/usb/class/Makefile | 2
- drivers/usb/class/audio.c | 3870 -------------------------------------------
+ drivers/usb/class/audio.c | 3869 -------------------------------------------
drivers/usb/class/audio.h | 110 -
- drivers/usb/class/usb-midi.c | 2154 -----------------------
+ drivers/usb/class/usb-midi.c | 2153 -----------------------
drivers/usb/class/usb-midi.h | 164 -
- 7 files changed, 6349 deletions(-)
+ 7 files changed, 6347 deletions(-)
--- gregkh-2.6.orig/drivers/usb/class/Kconfig
+++ gregkh-2.6/drivers/usb/class/Kconfig
@@ -268,7 +268,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
--- gregkh-2.6.orig/drivers/usb/class/usb-midi.c
+++ /dev/null
-@@ -1,2154 +0,0 @@
+@@ -1,2153 +0,0 @@
-/*
- usb-midi.c -- USB-MIDI driver
-
@@ -2298,7 +2298,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-};
-
-static struct usb_driver usb_midi_driver = {
-- .owner = THIS_MODULE,
- .name = "midi",
- .probe = usb_midi_probe,
- .disconnect = usb_midi_disconnect,
@@ -2538,7 +2537,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-#define PITCH_CONTROL 0x02
--- gregkh-2.6.orig/drivers/usb/class/audio.c
+++ /dev/null
-@@ -1,3870 +0,0 @@
+@@ -1,3869 +0,0 @@
-/*****************************************************************************/
-
-/*
@@ -5273,7 +5272,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-MODULE_DEVICE_TABLE (usb, usb_audio_ids);
-
-static struct usb_driver usb_audio_driver = {
-- .owner = THIS_MODULE,
- .name = "audio",
- .probe = usb_audio_probe,
- .disconnect = usb_audio_disconnect,