diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-11-15 16:01:10 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-11-15 16:01:10 -0800 |
| commit | e878580f6ea5b3217d94bb2184ce848595b56d6b (patch) | |
| tree | 9794475799c54727684f971a98896de8219b180e /usb | |
| parent | b1c8db5fb77b15c7179b8f8ef0730a6aa51fecee (diff) | |
| download | patches-e878580f6ea5b3217d94bb2184ce848595b56d6b.tar.gz | |
refresh and patch merge
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usb-gotemp.patch | 2 | ||||
| -rw-r--r-- | usb/usb-libusual.patch | 13 | ||||
| -rw-r--r-- | usb/usb-makefile-change-for-libusual.patch | 43 |
3 files changed, 13 insertions, 45 deletions
diff --git a/usb/usb-gotemp.patch b/usb/usb-gotemp.patch index bf41e7c9952638..f40965e16d220a 100644 --- a/usb/usb-gotemp.patch +++ b/usb/usb-gotemp.patch @@ -342,7 +342,7 @@ +MODULE_LICENSE("GPL"); --- gregkh-2.6.orig/drivers/usb/Makefile +++ gregkh-2.6/drivers/usb/Makefile -@@ -61,6 +61,7 @@ obj-$(CONFIG_USB_AUERSWALD) += misc/ +@@ -62,6 +62,7 @@ obj-$(CONFIG_USB_AUERSWALD) += misc/ obj-$(CONFIG_USB_CYTHERM) += misc/ obj-$(CONFIG_USB_EMI26) += misc/ obj-$(CONFIG_USB_EMI62) += misc/ diff --git a/usb/usb-libusual.patch b/usb/usb-libusual.patch index 12de9a2cdb77dc..1610e3c0668d11 100644 --- a/usb/usb-libusual.patch +++ b/usb/usb-libusual.patch @@ -16,6 +16,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/block/Kconfig | 3 drivers/block/ub.c | 23 +-- + drivers/usb/Makefile | 1 drivers/usb/storage/Kconfig | 14 + drivers/usb/storage/Makefile | 4 drivers/usb/storage/libusual.c | 266 +++++++++++++++++++++++++++++++++++++ @@ -25,7 +26,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/usb/storage/usb.c | 119 +++++----------- drivers/usb/storage/usb.h | 31 ---- include/linux/usb_usual.h | 123 +++++++++++++++++ - 11 files changed, 485 insertions(+), 167 deletions(-) + 12 files changed, 486 insertions(+), 167 deletions(-) --- gregkh-2.6.orig/drivers/block/Kconfig +++ gregkh-2.6/drivers/block/Kconfig @@ -901,3 +902,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +#endif /* CONFIG_USB_LIBUSUAL */ + +#endif /* __LINUX_USB_USUAL_H */ +--- gregkh-2.6.orig/drivers/usb/Makefile ++++ gregkh-2.6/drivers/usb/Makefile +@@ -20,6 +20,7 @@ obj-$(CONFIG_USB_ACM) += class/ + obj-$(CONFIG_USB_PRINTER) += class/ + + obj-$(CONFIG_USB_STORAGE) += storage/ ++obj-$(CONFIG_USB) += storage/ + + obj-$(CONFIG_USB_AIPTEK) += input/ + obj-$(CONFIG_USB_ATI_REMOTE) += input/ diff --git a/usb/usb-makefile-change-for-libusual.patch b/usb/usb-makefile-change-for-libusual.patch deleted file mode 100644 index 63a2c201fa5764..00000000000000 --- a/usb/usb-makefile-change-for-libusual.patch +++ /dev/null @@ -1,43 +0,0 @@ -From zaitcev@redhat.com Fri Nov 11 01:19:22 2005 -Date: Fri, 11 Nov 2005 01:14:36 -0800 -From: Pete Zaitcev <zaitcev@redhat.com> -To: greg@kroah.com, Adrian Bunk <bunk@stusta.de> -Cc: stern@rowland.harvard.edu, akpm@osdl.org, mdharm-usb@one-eyed-alien.net, zaitcev@redhat.com, <reuben-lkml@reub.net> -Subject: USB: Makefile change for libusual -Message-Id: <20051111011436.5804aac8.zaitcev@redhat.com> - -Never one to ignore a good idea, I propose to take a segment of -Adrian's patch which addresses this particular problem: - -> --- linux-2.6.14-mm1-full/drivers/usb/Makefile.old 2005-11-08 01:31:00.000000000 +0100 -> +++ linux-2.6.14-mm1-full/drivers/usb/Makefile 2005-11-08 01:31:26.000000000 +0100 -> @@ -22,6 +22,7 @@ -> obj-$(CONFIG_USB_PRINTER) += class/ -> -> obj-$(CONFIG_USB_STORAGE) += storage/ -> +obj-$(CONFIG_USB_LIBUSUAL) += storage/ -> -> obj-$(CONFIG_USB_AIPTEK) += input/ -> obj-$(CONFIG_USB_ATI_REMOTE) += input/ - -With a small change, this seems to work fine with the supplied .config. -Also I have tested my usual build modes and added Reuben's configuration -to my testing list. - -Signed-off-by: Pete Zaitcev <zaitcev@redhat.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/Makefile | 1 + - 1 file changed, 1 insertion(+) - ---- gregkh-2.6.orig/drivers/usb/Makefile -+++ gregkh-2.6/drivers/usb/Makefile -@@ -20,6 +20,7 @@ obj-$(CONFIG_USB_ACM) += class/ - obj-$(CONFIG_USB_PRINTER) += class/ - - obj-$(CONFIG_USB_STORAGE) += storage/ -+obj-$(CONFIG_USB) += storage/ - - obj-$(CONFIG_USB_AIPTEK) += input/ - obj-$(CONFIG_USB_ATI_REMOTE) += input/ |