diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-02-07 12:15:10 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-02-07 12:15:10 -0800 |
| commit | 6270aa63b3ee5dcf78aa915719a0425bbee176ee (patch) | |
| tree | a1dc773f8ec9fd1bc7954f46337c5c6c8f2a8f6e /usb | |
| parent | 641e80f1e8bdbcc54e037795ab9bbfc072551500 (diff) | |
| download | patches-6270aa63b3ee5dcf78aa915719a0425bbee176ee.tar.gz | |
pci patches
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usb-remove-obsolete_oss_usb_driver-drivers.patch | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/usb/usb-remove-obsolete_oss_usb_driver-drivers.patch b/usb/usb-remove-obsolete_oss_usb_driver-drivers.patch index dce9d70d83873f..f96dd077f88717 100644 --- a/usb/usb-remove-obsolete_oss_usb_driver-drivers.patch +++ b/usb/usb-remove-obsolete_oss_usb_driver-drivers.patch @@ -12,18 +12,17 @@ Signed-off-by: Adrian Bunk <bunk@stusta.de> 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 | 3869 ----------------------------------- - drivers/usb/class/audio.h | 110 - drivers/usb/class/usb-midi.c | 2153 ------------------- + drivers/usb/class/audio.c | 3869 ------------------------------------------- + drivers/usb/class/audio.h | 110 - + drivers/usb/class/usb-midi.c | 2153 ----------------------- drivers/usb/class/usb-midi.h | 164 - 7 files changed, 6347 deletions(-) ---- linux-2.6.16-rc1-mm5-full/drivers/usb/class/Kconfig.old 2006-02-04 23:28:08.000000000 +0100 -+++ linux-2.6.16-rc1-mm5-full/drivers/usb/class/Kconfig 2006-02-04 23:29:04.000000000 +0100 +--- gregkh-2.6.orig/drivers/usb/class/Kconfig ++++ gregkh-2.6/drivers/usb/class/Kconfig @@ -4,53 +4,6 @@ comment "USB Device Class drivers" depends on USB @@ -78,10 +77,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> config USB_ACM tristate "USB Modem (CDC ACM) support" depends on USB ---- linux-2.6.16-rc1-mm5-full/drivers/usb/Makefile.old 2006-02-04 23:29:14.000000000 +0100 -+++ linux-2.6.16-rc1-mm5-full/drivers/usb/Makefile 2006-02-04 23:29:22.000000000 +0100 -@@ -20,8 +20,6 @@ - obj-$(CONFIG_USB_IP) += ip/ +--- gregkh-2.6.orig/drivers/usb/Makefile ++++ gregkh-2.6/drivers/usb/Makefile +@@ -17,8 +17,6 @@ obj-$(CONFIG_USB_SL811_HCD) += host/ + obj-$(CONFIG_ETRAX_USB_HOST) += host/ obj-$(CONFIG_USB_ACM) += class/ -obj-$(CONFIG_USB_AUDIO) += class/ @@ -89,8 +88,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> obj-$(CONFIG_USB_PRINTER) += class/ obj-$(CONFIG_USB_STORAGE) += storage/ ---- linux-2.6.16-rc1-mm5-full/drivers/usb/class/Makefile.old 2006-02-04 23:29:33.000000000 +0100 -+++ linux-2.6.16-rc1-mm5-full/drivers/usb/class/Makefile 2006-02-04 23:29:38.000000000 +0100 +--- gregkh-2.6.orig/drivers/usb/class/Makefile ++++ gregkh-2.6/drivers/usb/class/Makefile @@ -4,6 +4,4 @@ # @@ -98,8 +97,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> -obj-$(CONFIG_USB_AUDIO) += audio.o -obj-$(CONFIG_USB_MIDI) += usb-midi.o obj-$(CONFIG_USB_PRINTER) += usblp.o ---- linux-2.6.16-rc1-mm5-full/drivers/usb/class/usb-midi.h 2006-02-04 23:27:58.000000000 +0100 -+++ /dev/null 2005-11-08 19:07:57.000000000 +0100 +--- gregkh-2.6.orig/drivers/usb/class/usb-midi.h ++++ /dev/null @@ -1,164 +0,0 @@ -/* - usb-midi.h -- USB-MIDI driver @@ -265,8 +264,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> -#endif /* _USB_MIDI_H_ */ - - ---- linux-2.6.16-rc1-mm5-full/drivers/usb/class/usb-midi.c 2006-02-04 23:27:58.000000000 +0100 -+++ /dev/null 2005-11-08 19:07:57.000000000 +0100 +--- gregkh-2.6.orig/drivers/usb/class/usb-midi.c ++++ /dev/null @@ -1,2153 +0,0 @@ -/* - usb-midi.c -- USB-MIDI driver @@ -2421,8 +2420,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> -EXPORT_SYMBOL(snd_usbmidi_midi); -#endif /* HAVE_ALSA_SUPPORT */ - ---- linux-2.6.16-rc1-mm5-full/drivers/usb/class/audio.h 2006-01-03 04:21:10.000000000 +0100 -+++ /dev/null 2005-11-08 19:07:57.000000000 +0100 +--- gregkh-2.6.orig/drivers/usb/class/audio.h ++++ /dev/null @@ -1,110 +0,0 @@ -#define CS_AUDIO_UNDEFINED 0x20 -#define CS_AUDIO_DEVICE 0x21 @@ -2534,8 +2533,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - -#define SAMPLING_FREQ_CONTROL 0x01 -#define PITCH_CONTROL 0x02 ---- linux-2.6.16-rc1-mm5-full/drivers/usb/class/audio.c 2006-02-03 12:44:15.000000000 +0100 -+++ /dev/null 2005-11-08 19:07:57.000000000 +0100 +--- gregkh-2.6.orig/drivers/usb/class/audio.c ++++ /dev/null @@ -1,3869 +0,0 @@ -/*****************************************************************************/ - @@ -6406,4 +6405,3 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> -MODULE_DESCRIPTION( DRIVER_DESC ); -MODULE_LICENSE("GPL"); - - |