diff options
| -rw-r--r-- | f4.patch | 55 | ||||
| -rw-r--r-- | series | 10 | ||||
| -rw-r--r-- | usb/usb-gadget-make-gadget_core.ko.patch (renamed from f2.patch) | 18 | ||||
| -rw-r--r-- | usb/usb-gadget-move-f_acm.c-and-u_serial.c-gadget_acm_core.ko.patch (renamed from f5.patch) | 51 | ||||
| -rw-r--r-- | usb/usb-gadget-move-f_ecm.c-to-gadget_ecm_core.ko.patch | 82 | ||||
| -rw-r--r-- | usb/usb-gadget-move-u_ether.c-to-gadget_ether_core.ko.patch (renamed from f3.patch) | 55 |
6 files changed, 174 insertions, 97 deletions
diff --git a/f4.patch b/f4.patch deleted file mode 100644 index b880f2cee29a28..00000000000000 --- a/f4.patch +++ /dev/null @@ -1,55 +0,0 @@ -From foo@baz Tue Apr 9 12:12:43 2002 -Date: Wed, 13 Aug 2008 20:08:35 -0700 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: USB gadget: add f_ecm.c to g_util.ko - -As f_ecm.c is also included in multiple .ko files, move it into -g_util.ko - -Cc: David Brownell <david-b@pacbell.net> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/gadget/Makefile | 7 +++---- - drivers/usb/gadget/f_ecm.c | 2 ++ - 2 files changed, 5 insertions(+), 4 deletions(-) - ---- a/drivers/usb/gadget/f_ecm.c -+++ b/drivers/usb/gadget/f_ecm.c -@@ -734,6 +734,7 @@ fail: - - return status; - } -+EXPORT_SYMBOL_GPL(ecm_bind); - - static void - ecm_unbind(struct usb_configuration *c, struct usb_function *f) -@@ -829,3 +830,4 @@ int __init ecm_bind_config(struct usb_co - } - return status; - } -+EXPORT_SYMBOL_GPL(ecm_bind_config); ---- a/drivers/usb/gadget/Makefile -+++ b/drivers/usb/gadget/Makefile -@@ -24,17 +24,16 @@ obj-$(CONFIG_USB_M66592) += m66592-udc.o - # - - g_utils-objs := composite.o usbstring.o config.o \ -- epautoconf.o u_ether.o -+ epautoconf.o u_ether.o f_ecm.o - - g_zero-objs := zero.o f_sourcesink.o f_loopback.o --g_ether-objs := ether.o f_subset.o f_ecm.o -+g_ether-objs := ether.o f_subset.o - g_serial-objs := serial.o u_serial.o f_acm.o f_serial.o - g_midi-objs := gmidi.o - gadgetfs-objs := inode.o - g_file_storage-objs := file_storage.o - g_printer-objs := printer.o --g_cdc-objs := cdc2.o f_ecm.o \ -- u_serial.o f_acm.o -+g_cdc-objs := cdc2.o u_serial.o f_acm.o - - ifeq ($(CONFIG_USB_ETH_RNDIS),y) - g_ether-objs += f_rndis.o rndis.o @@ -148,6 +148,11 @@ usb/usb-convert-the-usb-core-code-to-use-usb_dbg.patch usb/usb-convert-the-usb-host-controller-code-to-use-usb_dbg.patch usb/usb-remove-config_usb_debug.patch +usb/usb-gadget-make-gadget_core.ko.patch +usb/usb-gadget-move-u_ether.c-to-gadget_ether_core.ko.patch +usb/usb-gadget-move-f_ecm.c-to-gadget_ecm_core.ko.patch +usb/usb-gadget-move-f_acm.c-and-u_serial.c-gadget_acm_core.ko.patch + # my ols tutorial driver, never in mainline usb/usb-gotemp.patch @@ -169,9 +174,4 @@ usb/usb-gotemp.patch #ns/module-usb-serial.patch #ns/modpost -f2.patch - -f3.patch -f4.patch -f5.patch driver-core-basic-infrastructure-for-per-module-dynamic-debug-messages.patch diff --git a/f2.patch b/usb/usb-gadget-make-gadget_core.ko.patch index 6aa21a6ddab2fb..635048719b2231 100644 --- a/f2.patch +++ b/usb/usb-gadget-make-gadget_core.ko.patch @@ -2,7 +2,7 @@ From foo@baz Tue Apr 9 12:12:43 2002 Date: Wed, 13 Aug 2008 20:08:35 -0700 To: Greg KH <greg@kroah.com> From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: USB gadget: make g_util.ko +Subject: USB gadget: make gadget_core.ko This moves the "C_UTILS" files in the USB gadget subsystem into a common kernel module. This solves a number of kernel build issues (same .o @@ -144,7 +144,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> -g_file_storage-objs := file_storage.o usbstring.o config.o \ - epautoconf.o -g_printer-objs := printer.o usbstring.o config.o \ -+g_utils-objs := composite.o usbstring.o config.o \ ++gadget_core-objs := composite.o usbstring.o config.o \ epautoconf.o + +g_zero-objs := zero.o f_sourcesink.o f_loopback.o @@ -164,19 +164,19 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> -obj-$(CONFIG_USB_ZERO) += g_zero.o -obj-$(CONFIG_USB_ETH) += g_ether.o -+obj-$(CONFIG_USB_ZERO) += g_zero.o g_utils.o -+obj-$(CONFIG_USB_ETH) += g_ether.o g_utils.o ++obj-$(CONFIG_USB_ZERO) += g_zero.o gadget_core.o ++obj-$(CONFIG_USB_ETH) += g_ether.o gadget_core.o obj-$(CONFIG_USB_GADGETFS) += gadgetfs.o -obj-$(CONFIG_USB_FILE_STORAGE) += g_file_storage.o -obj-$(CONFIG_USB_G_SERIAL) += g_serial.o -obj-$(CONFIG_USB_G_PRINTER) += g_printer.o -obj-$(CONFIG_USB_MIDI_GADGET) += g_midi.o -obj-$(CONFIG_USB_CDC_COMPOSITE) += g_cdc.o -+obj-$(CONFIG_USB_FILE_STORAGE) += g_file_storage.o g_utils.o -+obj-$(CONFIG_USB_G_SERIAL) += g_serial.o g_utils.o -+obj-$(CONFIG_USB_G_PRINTER) += g_printer.o g_utils.o -+obj-$(CONFIG_USB_MIDI_GADGET) += g_midi.o g_utils.o -+obj-$(CONFIG_USB_CDC_COMPOSITE) += g_cdc.o g_utils.o ++obj-$(CONFIG_USB_FILE_STORAGE) += g_file_storage.o gadget_core.o ++obj-$(CONFIG_USB_G_SERIAL) += g_serial.o gadget_core.o ++obj-$(CONFIG_USB_G_PRINTER) += g_printer.o gadget_core.o ++obj-$(CONFIG_USB_MIDI_GADGET) += g_midi.o gadget_core.o ++obj-$(CONFIG_USB_CDC_COMPOSITE) += g_cdc.o gadget_core.o --- a/drivers/usb/gadget/usbstring.c +++ b/drivers/usb/gadget/usbstring.c diff --git a/f5.patch b/usb/usb-gadget-move-f_acm.c-and-u_serial.c-gadget_acm_core.ko.patch index 075f98c4dcf6a7..efffa1fd272fd7 100644 --- a/f5.patch +++ b/usb/usb-gadget-move-f_acm.c-and-u_serial.c-gadget_acm_core.ko.patch @@ -2,19 +2,19 @@ From foo@baz Tue Apr 9 12:12:43 2002 Date: Wed, 13 Aug 2008 20:08:35 -0700 To: Greg KH <greg@kroah.com> From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: USB gadget: add f_acm.c and u_serial.c to g_util.ko +Subject: USB gadget: move f_acm.c and u_serial.c gadget_acm_core.ko -As f_acm.c and u_serial.c are also included in multiple .ko files, move -it into g_util.ko +As f_ecm.c and u_serial.c are included in multiple .ko files, move them +into a standalone gadget_acm_core.ko Cc: David Brownell <david-b@pacbell.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - drivers/usb/gadget/Makefile | 7 ++++--- - drivers/usb/gadget/f_acm.c | 2 ++ + drivers/usb/gadget/Makefile | 9 +++++---- + drivers/usb/gadget/f_acm.c | 16 ++++++++++++++++ drivers/usb/gadget/u_serial.c | 4 ++++ - 3 files changed, 10 insertions(+), 3 deletions(-) + 3 files changed, 25 insertions(+), 4 deletions(-) --- a/drivers/usb/gadget/f_acm.c +++ b/drivers/usb/gadget/f_acm.c @@ -26,20 +26,32 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static void acm_unbind(struct usb_configuration *c, struct usb_function *f) -@@ -757,3 +758,4 @@ int __init acm_bind_config(struct usb_co +@@ -757,3 +758,18 @@ int __init acm_bind_config(struct usb_co kfree(acm); return status; } +EXPORT_SYMBOL_GPL(acm_bind_config); ++ ++static int __init acm_init(void) ++{ ++ return 0; ++} ++ ++static void __exit acm_exit(void) ++{ ++} ++ ++module_init(acm_init); ++module_exit(acm_exit); ++ ++MODULE_LICENSE("GPL"); --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile -@@ -24,16 +24,17 @@ obj-$(CONFIG_USB_M66592) += m66592-udc.o - # - - g_utils-objs := composite.o usbstring.o config.o \ -- epautoconf.o u_ether.o f_ecm.o -+ epautoconf.o u_ether.o f_ecm.o \ -+ f_acm.o u_serial.o +@@ -27,15 +27,16 @@ gadget_core-objs := composite.o usbstri + epautoconf.o + gadget_ether_core-objs := u_ether.o + gadget_ecm_core-objs := f_ecm.o ++gadget_acm_core-objs := f_acm.o u_serial.o g_zero-objs := zero.o f_sourcesink.o f_loopback.o g_ether-objs := ether.o f_subset.o @@ -54,6 +66,17 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ifeq ($(CONFIG_USB_ETH_RNDIS),y) g_ether-objs += f_rndis.o rndis.o +@@ -46,8 +47,8 @@ obj-$(CONFIG_USB_ETH) += g_ether.o gadg + gadget_ecm_core.o + obj-$(CONFIG_USB_GADGETFS) += gadgetfs.o + obj-$(CONFIG_USB_FILE_STORAGE) += g_file_storage.o gadget_core.o +-obj-$(CONFIG_USB_G_SERIAL) += g_serial.o gadget_core.o ++obj-$(CONFIG_USB_G_SERIAL) += g_serial.o gadget_core.o gadget_acm_core.o + obj-$(CONFIG_USB_G_PRINTER) += g_printer.o gadget_core.o + obj-$(CONFIG_USB_MIDI_GADGET) += g_midi.o gadget_core.o + obj-$(CONFIG_USB_CDC_COMPOSITE) += g_cdc.o gadget_core.o gadget_ether_core.o \ +- gadget_ether_core.o ++ gadget_ether_core.o gadget_acm_core.o --- a/drivers/usb/gadget/u_serial.c +++ b/drivers/usb/gadget/u_serial.c @@ -1140,6 +1140,7 @@ fail: diff --git a/usb/usb-gadget-move-f_ecm.c-to-gadget_ecm_core.ko.patch b/usb/usb-gadget-move-f_ecm.c-to-gadget_ecm_core.ko.patch new file mode 100644 index 00000000000000..d0966c2aede812 --- /dev/null +++ b/usb/usb-gadget-move-f_ecm.c-to-gadget_ecm_core.ko.patch @@ -0,0 +1,82 @@ +From foo@baz Tue Apr 9 12:12:43 2002 +Date: Wed, 13 Aug 2008 20:08:35 -0700 +To: Greg KH <greg@kroah.com> +From: Greg Kroah-Hartman <gregkh@suse.de> +Subject: USB gadget: move f_ecm.c to gadget_ecm_core.ko + +As f_ecm.c is included in multiple .ko files, move it into a +standalone gadget_ecm_core.ko + +Cc: David Brownell <david-b@pacbell.net> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/gadget/Makefile | 12 +++++++----- + drivers/usb/gadget/f_ecm.c | 16 ++++++++++++++++ + 2 files changed, 23 insertions(+), 5 deletions(-) + +--- a/drivers/usb/gadget/f_ecm.c ++++ b/drivers/usb/gadget/f_ecm.c +@@ -734,6 +734,7 @@ fail: + + return status; + } ++EXPORT_SYMBOL_GPL(ecm_bind); + + static void + ecm_unbind(struct usb_configuration *c, struct usb_function *f) +@@ -829,3 +830,18 @@ int __init ecm_bind_config(struct usb_co + } + return status; + } ++EXPORT_SYMBOL_GPL(ecm_bind_config); ++ ++static int __init ecm_init(void) ++{ ++ return 0; ++} ++ ++static void __exit ecm_exit(void) ++{ ++} ++ ++module_init(ecm_init); ++module_exit(ecm_exit); ++ ++MODULE_LICENSE("GPL"); +--- a/drivers/usb/gadget/Makefile ++++ b/drivers/usb/gadget/Makefile +@@ -26,26 +26,28 @@ obj-$(CONFIG_USB_M66592) += m66592-udc.o + gadget_core-objs := composite.o usbstring.o config.o \ + epautoconf.o + gadget_ether_core-objs := u_ether.o ++gadget_ecm_core-objs := f_ecm.o + + g_zero-objs := zero.o f_sourcesink.o f_loopback.o +-g_ether-objs := ether.o f_subset.o f_ecm.o ++g_ether-objs := ether.o f_subset.o + g_serial-objs := serial.o u_serial.o f_acm.o f_serial.o + g_midi-objs := gmidi.o + gadgetfs-objs := inode.o + g_file_storage-objs := file_storage.o + g_printer-objs := printer.o +-g_cdc-objs := cdc2.o f_ecm.o u_serial.o f_acm.o ++g_cdc-objs := cdc2.o u_serial.o f_acm.o + + ifeq ($(CONFIG_USB_ETH_RNDIS),y) + g_ether-objs += f_rndis.o rndis.o + endif + + obj-$(CONFIG_USB_ZERO) += g_zero.o gadget_core.o +-obj-$(CONFIG_USB_ETH) += g_ether.o gadget_core.o gadget_ether_core.o ++obj-$(CONFIG_USB_ETH) += g_ether.o gadget_core.o gadget_ether_core.o \ ++ gadget_ecm_core.o + obj-$(CONFIG_USB_GADGETFS) += gadgetfs.o + obj-$(CONFIG_USB_FILE_STORAGE) += g_file_storage.o gadget_core.o + obj-$(CONFIG_USB_G_SERIAL) += g_serial.o gadget_core.o + obj-$(CONFIG_USB_G_PRINTER) += g_printer.o gadget_core.o + obj-$(CONFIG_USB_MIDI_GADGET) += g_midi.o gadget_core.o +-obj-$(CONFIG_USB_CDC_COMPOSITE) += g_cdc.o gadget_core.o gadget_ether_core.o +- ++obj-$(CONFIG_USB_CDC_COMPOSITE) += g_cdc.o gadget_core.o gadget_ether_core.o \ ++ gadget_ether_core.o diff --git a/f3.patch b/usb/usb-gadget-move-u_ether.c-to-gadget_ether_core.ko.patch index 97e019066c7273..291f8c8ad46e60 100644 --- a/f3.patch +++ b/usb/usb-gadget-move-u_ether.c-to-gadget_ether_core.ko.patch @@ -2,27 +2,26 @@ From foo@baz Tue Apr 9 12:12:43 2002 Date: Wed, 13 Aug 2008 20:08:35 -0700 To: Greg KH <greg@kroah.com> From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: USB gadget: add u_ether.c to g_util.ko +Subject: USB gadget: move u_ether.c to gadget_ether_core.ko -As u_ether.c is also included in multiple .ko files, move it into -g_util.ko +As u_ether.c is included in multiple .ko files, move it into a +standalone gadget_ether_core.ko Cc: David Brownell <david-b@pacbell.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - drivers/usb/gadget/Makefile | 6 +++--- - drivers/usb/gadget/u_ether.c | 5 ++++- - 2 files changed, 7 insertions(+), 4 deletions(-) + drivers/usb/gadget/Makefile | 10 +++++----- + drivers/usb/gadget/u_ether.c | 19 ++++++++++++++++++- + 2 files changed, 23 insertions(+), 6 deletions(-) --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile -@@ -24,16 +24,16 @@ obj-$(CONFIG_USB_M66592) += m66592-udc.o - # +@@ -25,27 +25,27 @@ obj-$(CONFIG_USB_M66592) += m66592-udc.o - g_utils-objs := composite.o usbstring.o config.o \ -- epautoconf.o -+ epautoconf.o u_ether.o + gadget_core-objs := composite.o usbstring.o config.o \ + epautoconf.o ++gadget_ether_core-objs := u_ether.o g_zero-objs := zero.o f_sourcesink.o f_loopback.o -g_ether-objs := ether.o u_ether.o f_subset.o f_ecm.o @@ -33,10 +32,24 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> g_file_storage-objs := file_storage.o g_printer-objs := printer.o -g_cdc-objs := cdc2.o u_ether.o f_ecm.o \ -+g_cdc-objs := cdc2.o f_ecm.o \ - u_serial.o f_acm.o +- u_serial.o f_acm.o ++g_cdc-objs := cdc2.o f_ecm.o u_serial.o f_acm.o ifeq ($(CONFIG_USB_ETH_RNDIS),y) + g_ether-objs += f_rndis.o rndis.o + endif + + obj-$(CONFIG_USB_ZERO) += g_zero.o gadget_core.o +-obj-$(CONFIG_USB_ETH) += g_ether.o gadget_core.o ++obj-$(CONFIG_USB_ETH) += g_ether.o gadget_core.o gadget_ether_core.o + obj-$(CONFIG_USB_GADGETFS) += gadgetfs.o + obj-$(CONFIG_USB_FILE_STORAGE) += g_file_storage.o gadget_core.o + obj-$(CONFIG_USB_G_SERIAL) += g_serial.o gadget_core.o + obj-$(CONFIG_USB_G_PRINTER) += g_printer.o gadget_core.o + obj-$(CONFIG_USB_MIDI_GADGET) += g_midi.o gadget_core.o +-obj-$(CONFIG_USB_CDC_COMPOSITE) += g_cdc.o gadget_core.o ++obj-$(CONFIG_USB_CDC_COMPOSITE) += g_cdc.o gadget_core.o gadget_ether_core.o + --- a/drivers/usb/gadget/u_ether.c +++ b/drivers/usb/gadget/u_ether.c @@ -797,6 +797,7 @@ int __init gether_setup(struct usb_gadge @@ -64,8 +77,22 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /** * gether_disconnect - notify network layer that USB link is inactive -@@ -962,3 +964,4 @@ void gether_disconnect(struct gether *li +@@ -962,3 +964,18 @@ void gether_disconnect(struct gether *li link->ioport = NULL; spin_unlock(&dev->lock); } +EXPORT_SYMBOL_GPL(gether_disconnect); ++ ++static int __init gether_init(void) ++{ ++ return 0; ++} ++ ++static void __exit gether_exit(void) ++{ ++} ++ ++module_init(gether_init); ++module_exit(gether_exit); ++ ++MODULE_LICENSE("GPL"); |