aboutsummaryrefslogtreecommitdiffstats
path: root/usb
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-11-22 11:12:45 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2005-11-22 11:12:45 -0800
commit57e3a9f3da0a3f1af885229b21acc77456324070 (patch)
tree76a1507a2161f811abb38e4b9ae92106280e1df6 /usb
parent31bb5d8e9d226ed75e3341170f3f3281b87ad144 (diff)
downloadpatches-57e3a9f3da0a3f1af885229b21acc77456324070.tar.gz
add 2 usb patches
Diffstat (limited to 'usb')
-rw-r--r--usb/disconnect-children-during-hub-unbind.patch2
-rw-r--r--usb/remove-usb-private-semaphore.patch6
-rw-r--r--usb/usb-driver-owner-removal.patch1364
-rw-r--r--usb/usb-driver-owner.patch71
-rw-r--r--usb/usb-gotemp.patch7
5 files changed, 1442 insertions, 8 deletions
diff --git a/usb/disconnect-children-during-hub-unbind.patch b/usb/disconnect-children-during-hub-unbind.patch
index 5a328c034051a..8486b0cf19b87 100644
--- a/usb/disconnect-children-during-hub-unbind.patch
+++ b/usb/disconnect-children-during-hub-unbind.patch
@@ -165,7 +165,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
goto loop;
}
-@@ -2998,7 +2966,7 @@ int usb_reset_device(struct usb_device *
+@@ -2997,7 +2965,7 @@ int usb_reset_device(struct usb_device *
udev->actconfig->interface[0]->dev.driver ==
&hub_driver.driver &&
(hub = hdev_to_hub(udev)) != NULL) {
diff --git a/usb/remove-usb-private-semaphore.patch b/usb/remove-usb-private-semaphore.patch
index 7da9182cab706..67b795b474721 100644
--- a/usb/remove-usb-private-semaphore.patch
+++ b/usb/remove-usb-private-semaphore.patch
@@ -42,7 +42,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- gregkh-2.6.orig/drivers/usb/core/devio.c
+++ gregkh-2.6/drivers/usb/core/devio.c
-@@ -1350,9 +1350,7 @@ static int proc_ioctl(struct dev_state *
+@@ -1349,9 +1349,7 @@ static int proc_ioctl(struct dev_state *
/* let kernel drivers try to (re)bind to the interface */
case USBDEVFS_CONNECT:
usb_unlock_device(ps->dev);
@@ -273,7 +273,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
extern int usb_reset_device(struct usb_device *dev);
--- gregkh-2.6.orig/drivers/usb/core/driver.c
+++ gregkh-2.6/drivers/usb/core/driver.c
-@@ -431,9 +431,7 @@ int usb_register(struct usb_driver *new_
+@@ -432,9 +432,7 @@ int usb_register_driver(struct usb_drive
spin_lock_init(&new_driver->dynids.lock);
INIT_LIST_HEAD(&new_driver->dynids.list);
@@ -283,7 +283,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
if (!retval) {
pr_info("%s: registered new driver %s\n",
-@@ -464,11 +462,9 @@ void usb_deregister(struct usb_driver *d
+@@ -465,11 +463,9 @@ void usb_deregister(struct usb_driver *d
{
pr_info("%s: deregistering driver %s\n", usbcore_name, driver->name);
diff --git a/usb/usb-driver-owner-removal.patch b/usb/usb-driver-owner-removal.patch
new file mode 100644
index 0000000000000..00be664eca49e
--- /dev/null
+++ b/usb/usb-driver-owner-removal.patch
@@ -0,0 +1,1364 @@
+From foo@baz.org Tue Nov 22 09:58:23 2005
+Date: Mon, 21 Nov 2005 14:53:03 -0800
+From: Greg Kroah-Hartman <gregkh@suse.de>
+Subject: USB: remove .owner field from struct usb_driver
+
+It is no longer needed, so let's remove it, saving a bit of memory.
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/block/ub.c | 1 -
+ drivers/bluetooth/bcm203x.c | 1 -
+ drivers/bluetooth/bfusb.c | 1 -
+ drivers/bluetooth/bpa10x.c | 1 -
+ drivers/bluetooth/hci_usb.c | 1 -
+ drivers/char/watchdog/pcwd_usb.c | 1 -
+ drivers/input/joystick/iforce/iforce-usb.c | 1 -
+ drivers/isdn/hisax/hfc_usb.c | 1 -
+ drivers/isdn/hisax/st5481_init.c | 1 -
+ drivers/media/dvb/b2c2/flexcop-usb.c | 1 -
+ drivers/media/dvb/cinergyT2/cinergyT2.c | 1 -
+ drivers/media/dvb/dvb-usb/a800.c | 1 -
+ drivers/media/dvb/dvb-usb/cxusb.c | 1 -
+ drivers/media/dvb/dvb-usb/dibusb-mb.c | 1 -
+ drivers/media/dvb/dvb-usb/dibusb-mc.c | 1 -
+ drivers/media/dvb/dvb-usb/digitv.c | 1 -
+ drivers/media/dvb/dvb-usb/dtt200u.c | 1 -
+ drivers/media/dvb/dvb-usb/nova-t-usb2.c | 1 -
+ drivers/media/dvb/dvb-usb/umt-010.c | 1 -
+ drivers/media/dvb/dvb-usb/vp702x.c | 1 -
+ drivers/media/dvb/dvb-usb/vp7045.c | 1 -
+ drivers/media/video/cpia_usb.c | 1 -
+ drivers/media/video/em28xx/em28xx-video.c | 1 -
+ drivers/net/irda/irda-usb.c | 1 -
+ drivers/net/irda/stir4200.c | 1 -
+ drivers/usb/atm/cxacru.c | 1 -
+ drivers/usb/atm/speedtch.c | 1 -
+ drivers/usb/atm/ueagle-atm.c | 1 -
+ drivers/usb/atm/xusbatm.c | 1 -
+ drivers/usb/class/cdc-acm.c | 1 -
+ drivers/usb/class/usblp.c | 1 -
+ drivers/usb/core/devio.c | 1 -
+ drivers/usb/core/hub.c | 1 -
+ drivers/usb/image/mdc800.c | 1 -
+ drivers/usb/image/microtek.c | 1 -
+ drivers/usb/input/acecad.c | 1 -
+ drivers/usb/input/aiptek.c | 1 -
+ drivers/usb/input/appletouch.c | 1 -
+ drivers/usb/input/ati_remote.c | 1 -
+ drivers/usb/input/hid-core.c | 1 -
+ drivers/usb/input/hiddev.c | 1 -
+ drivers/usb/input/itmtouch.c | 1 -
+ drivers/usb/input/kbtab.c | 1 -
+ drivers/usb/input/keyspan_remote.c | 1 -
+ drivers/usb/input/mtouchusb.c | 1 -
+ drivers/usb/input/powermate.c | 1 -
+ drivers/usb/input/touchkitusb.c | 1 -
+ drivers/usb/input/usbkbd.c | 1 -
+ drivers/usb/input/usbmouse.c | 1 -
+ drivers/usb/input/wacom.c | 1 -
+ drivers/usb/input/xpad.c | 1 -
+ drivers/usb/input/yealink.c | 1 -
+ drivers/usb/media/dabusb.c | 1 -
+ drivers/usb/media/dsbr100.c | 1 -
+ drivers/usb/media/ov511.c | 1 -
+ drivers/usb/media/pwc/pwc-if.c | 1 -
+ drivers/usb/media/se401.c | 1 -
+ drivers/usb/media/sn9c102_core.c | 1 -
+ drivers/usb/media/stv680.c | 1 -
+ drivers/usb/media/vicam.c | 1 -
+ drivers/usb/misc/auerswald.c | 1 -
+ drivers/usb/misc/cytherm.c | 1 -
+ drivers/usb/misc/emi26.c | 1 -
+ drivers/usb/misc/emi62.c | 1 -
+ drivers/usb/misc/idmouse.c | 1 -
+ drivers/usb/misc/ldusb.c | 1 -
+ drivers/usb/misc/legousbtower.c | 1 -
+ drivers/usb/misc/phidgetkit.c | 1 -
+ drivers/usb/misc/phidgetservo.c | 1 -
+ drivers/usb/misc/rio500.c | 1 -
+ drivers/usb/misc/sisusbvga/sisusb.c | 1 -
+ drivers/usb/misc/usblcd.c | 1 -
+ drivers/usb/misc/usbled.c | 1 -
+ drivers/usb/misc/usbtest.c | 1 -
+ drivers/usb/misc/uss720.c | 1 -
+ drivers/usb/net/asix.c | 1 -
+ drivers/usb/net/catc.c | 1 -
+ drivers/usb/net/cdc_ether.c | 1 -
+ drivers/usb/net/cdc_subset.c | 1 -
+ drivers/usb/net/gl620a.c | 1 -
+ drivers/usb/net/kaweth.c | 1 -
+ drivers/usb/net/net1080.c | 1 -
+ drivers/usb/net/plusb.c | 1 -
+ drivers/usb/net/rndis_host.c | 1 -
+ drivers/usb/net/rtl8150.c | 1 -
+ drivers/usb/net/zaurus.c | 1 -
+ drivers/usb/net/zd1201.c | 1 -
+ drivers/usb/serial/airprime.c | 1 -
+ drivers/usb/serial/anydata.c | 1 -
+ drivers/usb/serial/belkin_sa.c | 1 -
+ drivers/usb/serial/cp2101.c | 1 -
+ drivers/usb/serial/cyberjack.c | 1 -
+ drivers/usb/serial/digi_acceleport.c | 1 -
+ drivers/usb/serial/empeg.c | 1 -
+ drivers/usb/serial/garmin_gps.c | 1 -
+ drivers/usb/serial/generic.c | 1 -
+ drivers/usb/serial/hp4x.c | 1 -
+ drivers/usb/serial/io_edgeport.c | 1 -
+ drivers/usb/serial/io_ti.c | 1 -
+ drivers/usb/serial/ipaq.c | 1 -
+ drivers/usb/serial/ipw.c | 1 -
+ drivers/usb/serial/ir-usb.c | 1 -
+ drivers/usb/serial/keyspan.h | 1 -
+ drivers/usb/serial/keyspan_pda.c | 1 -
+ drivers/usb/serial/kl5kusb105.c | 1 -
+ drivers/usb/serial/kobil_sct.c | 1 -
+ drivers/usb/serial/mct_u232.c | 1 -
+ drivers/usb/serial/omninet.c | 1 -
+ drivers/usb/serial/option.c | 1 -
+ drivers/usb/serial/pl2303.c | 1 -
+ drivers/usb/serial/safe_serial.c | 1 -
+ drivers/usb/serial/ti_usb_3410_5052.c | 1 -
+ drivers/usb/serial/usb-serial.c | 1 -
+ drivers/usb/serial/visor.c | 1 -
+ drivers/usb/serial/whiteheat.c | 1 -
+ drivers/usb/storage/libusual.c | 1 -
+ drivers/usb/storage/usb.c | 1 -
+ drivers/usb/usb-skeleton.c | 1 -
+ drivers/w1/dscore.c | 1 -
+ include/linux/usb.h | 4 ----
+ sound/usb/usbaudio.c | 1 -
+ sound/usb/usx2y/usbusx2y.c | 1 -
+ 122 files changed, 125 deletions(-)
+
+--- gregkh-2.6.orig/drivers/usb/core/devio.c
++++ gregkh-2.6/drivers/usb/core/devio.c
+@@ -402,7 +402,6 @@ static void driver_disconnect(struct usb
+ }
+
+ struct usb_driver usbfs_driver = {
+- .owner = THIS_MODULE,
+ .name = "usbfs",
+ .probe = driver_probe,
+ .disconnect = driver_disconnect,
+--- gregkh-2.6.orig/drivers/usb/core/hub.c
++++ gregkh-2.6/drivers/usb/core/hub.c
+@@ -2865,7 +2865,6 @@ static struct usb_device_id hub_id_table
+ MODULE_DEVICE_TABLE (usb, hub_id_table);
+
+ static struct usb_driver hub_driver = {
+- .owner = THIS_MODULE,
+ .name = "hub",
+ .probe = hub_probe,
+ .disconnect = hub_disconnect,
+--- gregkh-2.6.orig/include/linux/usb.h
++++ gregkh-2.6/include/linux/usb.h
+@@ -535,8 +535,6 @@ struct usb_dynids {
+
+ /**
+ * struct usb_driver - identifies USB driver to usbcore
+- * @owner: Pointer to the module owner of this driver; initialize
+- * it using THIS_MODULE.
+ * @name: The driver name should be unique among USB drivers,
+ * and should normally be the same as the module name.
+ * @probe: Called to see if the driver is willing to manage a particular
+@@ -579,8 +577,6 @@ struct usb_dynids {
+ * them as necessary, and blocking until the unlinks complete).
+ */
+ struct usb_driver {
+- struct module *owner;
+-
+ const char *name;
+
+ int (*probe) (struct usb_interface *intf,
+--- gregkh-2.6.orig/drivers/usb/serial/airprime.c
++++ gregkh-2.6/drivers/usb/serial/airprime.c
+@@ -23,7 +23,6 @@ static struct usb_device_id id_table []
+ MODULE_DEVICE_TABLE(usb, id_table);
+
+ static struct usb_driver airprime_driver = {
+- .owner = THIS_MODULE,
+ .name = "airprime",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/anydata.c
++++ gregkh-2.6/drivers/usb/serial/anydata.c
+@@ -27,7 +27,6 @@ static int buffer_size;
+ static int debug;
+
+ static struct usb_driver anydata_driver = {
+- .owner = THIS_MODULE,
+ .name = "anydata",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/belkin_sa.c
++++ gregkh-2.6/drivers/usb/serial/belkin_sa.c
+@@ -113,7 +113,6 @@ static struct usb_device_id id_table_com
+ MODULE_DEVICE_TABLE (usb, id_table_combined);
+
+ static struct usb_driver belkin_driver = {
+- .owner = THIS_MODULE,
+ .name = "belkin",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/cp2101.c
++++ gregkh-2.6/drivers/usb/serial/cp2101.c
+@@ -67,7 +67,6 @@ static struct usb_device_id id_table []
+ MODULE_DEVICE_TABLE (usb, id_table);
+
+ static struct usb_driver cp2101_driver = {
+- .owner = THIS_MODULE,
+ .name = "cp2101",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/cyberjack.c
++++ gregkh-2.6/drivers/usb/serial/cyberjack.c
+@@ -76,7 +76,6 @@ static struct usb_device_id id_table []
+ MODULE_DEVICE_TABLE (usb, id_table);
+
+ static struct usb_driver cyberjack_driver = {
+- .owner = THIS_MODULE,
+ .name = "cyberjack",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/digi_acceleport.c
++++ gregkh-2.6/drivers/usb/serial/digi_acceleport.c
+@@ -493,7 +493,6 @@ static struct usb_device_id id_table_4 [
+ MODULE_DEVICE_TABLE (usb, id_table_combined);
+
+ static struct usb_driver digi_driver = {
+- .owner = THIS_MODULE,
+ .name = "digi_acceleport",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/empeg.c
++++ gregkh-2.6/drivers/usb/serial/empeg.c
+@@ -105,7 +105,6 @@ static struct usb_device_id id_table []
+ MODULE_DEVICE_TABLE (usb, id_table);
+
+ static struct usb_driver empeg_driver = {
+- .owner = THIS_MODULE,
+ .name = "empeg",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/garmin_gps.c
++++ gregkh-2.6/drivers/usb/serial/garmin_gps.c
+@@ -222,7 +222,6 @@ static struct usb_device_id id_table []
+ MODULE_DEVICE_TABLE (usb, id_table);
+
+ static struct usb_driver garmin_driver = {
+- .owner = THIS_MODULE,
+ .name = "garmin_gps",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/generic.c
++++ gregkh-2.6/drivers/usb/serial/generic.c
+@@ -68,7 +68,6 @@ static int generic_probe(struct usb_inte
+ }
+
+ static struct usb_driver generic_driver = {
+- .owner = THIS_MODULE,
+ .name = "usbserial_generic",
+ .probe = generic_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/hp4x.c
++++ gregkh-2.6/drivers/usb/serial/hp4x.c
+@@ -37,7 +37,6 @@ static struct usb_device_id id_table []
+ MODULE_DEVICE_TABLE(usb, id_table);
+
+ static struct usb_driver hp49gp_driver = {
+- .owner = THIS_MODULE,
+ .name = "hp4X",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/io_edgeport.c
++++ gregkh-2.6/drivers/usb/serial/io_edgeport.c
+@@ -242,7 +242,6 @@ static void edge_shutdown (struct usb_s
+ #include "io_tables.h" /* all of the devices that this driver supports */
+
+ static struct usb_driver io_driver = {
+- .owner = THIS_MODULE,
+ .name = "io_edgeport",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/io_ti.c
++++ gregkh-2.6/drivers/usb/serial/io_ti.c
+@@ -216,7 +216,6 @@ static struct usb_device_id id_table_com
+ MODULE_DEVICE_TABLE (usb, id_table_combined);
+
+ static struct usb_driver io_driver = {
+- .owner = THIS_MODULE,
+ .name = "io_ti",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/ipaq.c
++++ gregkh-2.6/drivers/usb/serial/ipaq.c
+@@ -542,7 +542,6 @@ static struct usb_device_id ipaq_id_tabl
+ MODULE_DEVICE_TABLE (usb, ipaq_id_table);
+
+ static struct usb_driver ipaq_driver = {
+- .owner = THIS_MODULE,
+ .name = "ipaq",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/ipw.c
++++ gregkh-2.6/drivers/usb/serial/ipw.c
+@@ -153,7 +153,6 @@ static struct usb_device_id usb_ipw_ids[
+ MODULE_DEVICE_TABLE(usb, usb_ipw_ids);
+
+ static struct usb_driver usb_ipw_driver = {
+- .owner = THIS_MODULE,
+ .name = "ipwtty",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/ir-usb.c
++++ gregkh-2.6/drivers/usb/serial/ir-usb.c
+@@ -125,7 +125,6 @@ static struct usb_device_id id_table []
+ MODULE_DEVICE_TABLE (usb, id_table);
+
+ static struct usb_driver ir_driver = {
+- .owner = THIS_MODULE,
+ .name = "ir-usb",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/keyspan_pda.c
++++ gregkh-2.6/drivers/usb/serial/keyspan_pda.c
+@@ -150,7 +150,6 @@ static struct usb_device_id id_table_com
+ MODULE_DEVICE_TABLE (usb, id_table_combined);
+
+ static struct usb_driver keyspan_pda_driver = {
+- .owner = THIS_MODULE,
+ .name = "keyspan_pda",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/kl5kusb105.c
++++ gregkh-2.6/drivers/usb/serial/kl5kusb105.c
+@@ -116,7 +116,6 @@ static struct usb_device_id id_table []
+ MODULE_DEVICE_TABLE (usb, id_table);
+
+ static struct usb_driver kl5kusb105d_driver = {
+- .owner = THIS_MODULE,
+ .name = "kl5kusb105d",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/kobil_sct.c
++++ gregkh-2.6/drivers/usb/serial/kobil_sct.c
+@@ -97,7 +97,6 @@ static struct usb_device_id id_table []
+ MODULE_DEVICE_TABLE (usb, id_table);
+
+ static struct usb_driver kobil_driver = {
+- .owner = THIS_MODULE,
+ .name = "kobil",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/mct_u232.c
++++ gregkh-2.6/drivers/usb/serial/mct_u232.c
+@@ -125,7 +125,6 @@ static struct usb_device_id id_table_com
+ MODULE_DEVICE_TABLE (usb, id_table_combined);
+
+ static struct usb_driver mct_u232_driver = {
+- .owner = THIS_MODULE,
+ .name = "mct_u232",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/omninet.c
++++ gregkh-2.6/drivers/usb/serial/omninet.c
+@@ -80,7 +80,6 @@ static struct usb_device_id id_table []
+ MODULE_DEVICE_TABLE (usb, id_table);
+
+ static struct usb_driver omninet_driver = {
+- .owner = THIS_MODULE,
+ .name = "omninet",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/option.c
++++ gregkh-2.6/drivers/usb/serial/option.c
+@@ -95,7 +95,6 @@ static struct usb_device_id option_ids[]
+ MODULE_DEVICE_TABLE(usb, option_ids);
+
+ static struct usb_driver option_driver = {
+- .owner = THIS_MODULE,
+ .name = "option",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/pl2303.c
++++ gregkh-2.6/drivers/usb/serial/pl2303.c
+@@ -82,7 +82,6 @@ static struct usb_device_id id_table []
+ MODULE_DEVICE_TABLE (usb, id_table);
+
+ static struct usb_driver pl2303_driver = {
+- .owner = THIS_MODULE,
+ .name = "pl2303",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/safe_serial.c
++++ gregkh-2.6/drivers/usb/serial/safe_serial.c
+@@ -160,7 +160,6 @@ static struct usb_device_id id_table[] =
+ MODULE_DEVICE_TABLE (usb, id_table);
+
+ static struct usb_driver safe_driver = {
+- .owner = THIS_MODULE,
+ .name = "safe_serial",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/ti_usb_3410_5052.c
++++ gregkh-2.6/drivers/usb/serial/ti_usb_3410_5052.c
+@@ -248,7 +248,6 @@ static struct usb_device_id ti_id_table_
+ };
+
+ static struct usb_driver ti_usb_driver = {
+- .owner = THIS_MODULE,
+ .name = "ti_usb_3410_5052",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/usb-serial.c
++++ gregkh-2.6/drivers/usb/serial/usb-serial.c
+@@ -42,7 +42,6 @@
+
+ /* Driver structure we register with the USB core */
+ static struct usb_driver usb_serial_driver = {
+- .owner = THIS_MODULE,
+ .name = "usbserial",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/visor.c
++++ gregkh-2.6/drivers/usb/serial/visor.c
+@@ -173,7 +173,6 @@ static struct usb_device_id id_table_com
+ MODULE_DEVICE_TABLE (usb, id_table_combined);
+
+ static struct usb_driver visor_driver = {
+- .owner = THIS_MODULE,
+ .name = "visor",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/whiteheat.c
++++ gregkh-2.6/drivers/usb/serial/whiteheat.c
+@@ -127,7 +127,6 @@ static struct usb_device_id id_table_com
+ MODULE_DEVICE_TABLE (usb, id_table_combined);
+
+ static struct usb_driver whiteheat_driver = {
+- .owner = THIS_MODULE,
+ .name = "whiteheat",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/serial/keyspan.h
++++ gregkh-2.6/drivers/usb/serial/keyspan.h
+@@ -520,7 +520,6 @@ static struct usb_device_id keyspan_ids_
+ MODULE_DEVICE_TABLE(usb, keyspan_ids_combined);
+
+ static struct usb_driver keyspan_driver = {
+- .owner = THIS_MODULE,
+ .name = "keyspan",
+ .probe = usb_serial_probe,
+ .disconnect = usb_serial_disconnect,
+--- gregkh-2.6.orig/drivers/usb/usb-skeleton.c
++++ gregkh-2.6/drivers/usb/usb-skeleton.c
+@@ -330,7 +330,6 @@ static void skel_disconnect(struct usb_i
+ }
+
+ static struct usb_driver skel_driver = {
+- .owner = THIS_MODULE,
+ .name = "skeleton",
+ .probe = skel_probe,
+ .disconnect = skel_disconnect,
+--- gregkh-2.6.orig/drivers/usb/atm/cxacru.c
++++ gregkh-2.6/drivers/usb/atm/cxacru.c
+@@ -850,7 +850,6 @@ static int cxacru_usb_probe(struct usb_i
+ }
+
+ static struct usb_driver cxacru_usb_driver = {
+- .owner = THIS_MODULE,
+ .name = cxacru_driver_name,
+ .probe = cxacru_usb_probe,
+ .disconnect = usbatm_usb_disconnect,
+--- gregkh-2.6.orig/drivers/usb/atm/speedtch.c
++++ gregkh-2.6/drivers/usb/atm/speedtch.c
+@@ -659,7 +659,6 @@ MODULE_DEVICE_TABLE(usb, speedtch_usb_id
+ static int speedtch_usb_probe(struct usb_interface *, const struct usb_device_id *);
+
+ static struct usb_driver speedtch_usb_driver = {
+- .owner = THIS_MODULE,
+ .name = speedtch_driver_name,
+ .probe = speedtch_usb_probe,
+ .disconnect = usbatm_usb_disconnect,
+--- gregkh-2.6.orig/drivers/usb/atm/ueagle-atm.c
++++ gregkh-2.6/drivers/usb/atm/ueagle-atm.c
+@@ -1776,7 +1776,6 @@ static const struct usb_device_id uea_id
+ * USB driver descriptor
+ */
+ static struct usb_driver uea_driver = {
+- .owner = THIS_MODULE,
+ .name = "ueagle-atm",
+ .id_table = uea_ids,
+ .probe = uea_probe,
+--- gregkh-2.6.orig/drivers/usb/atm/xusbatm.c
++++ gregkh-2.6/drivers/usb/atm/xusbatm.c
+@@ -140,7 +140,6 @@ static int xusbatm_usb_probe(struct usb_
+ }
+
+ static struct usb_driver xusbatm_usb_driver = {
+- .owner = THIS_MODULE,
+ .name = xusbatm_driver_name,
+ .probe = xusbatm_usb_probe,
+ .disconnect = usbatm_usb_disconnect,
+--- gregkh-2.6.orig/drivers/usb/class/cdc-acm.c
++++ gregkh-2.6/drivers/usb/class/cdc-acm.c
+@@ -1088,7 +1088,6 @@ static struct usb_device_id acm_ids[] =
+ MODULE_DEVICE_TABLE (usb, acm_ids);
+
+ static struct usb_driver acm_driver = {
+- .owner = THIS_MODULE,
+ .name = "cdc_acm",
+ .probe = acm_probe,
+ .disconnect = acm_disconnect,
+--- gregkh-2.6.orig/drivers/usb/class/usblp.c
++++ gregkh-2.6/drivers/usb/class/usblp.c
+@@ -1186,7 +1186,6 @@ static struct usb_device_id usblp_ids []
+ MODULE_DEVICE_TABLE (usb, usblp_ids);
+
+ static struct usb_driver usblp_driver = {
+- .owner = THIS_MODULE,
+ .name = "usblp",
+ .probe = usblp_probe,
+ .disconnect = usblp_disconnect,
+--- gregkh-2.6.orig/drivers/usb/input/acecad.c
++++ gregkh-2.6/drivers/usb/input/acecad.c
+@@ -261,7 +261,6 @@ static struct usb_device_id usb_acecad_i
+ MODULE_DEVICE_TABLE(usb, usb_acecad_id_table);
+
+ static struct usb_driver usb_acecad_driver = {
+- .owner = THIS_MODULE,
+ .name = "usb_acecad",
+ .probe = usb_acecad_probe,
+ .disconnect = usb_acecad_disconnect,
+--- gregkh-2.6.orig/drivers/usb/input/aiptek.c
++++ gregkh-2.6/drivers/usb/input/aiptek.c
+@@ -2190,7 +2190,6 @@ fail1: input_free_device(inputdev);
+ static void aiptek_disconnect(struct usb_interface *intf);
+
+ static struct usb_driver aiptek_driver = {
+- .owner = THIS_MODULE,
+ .name = "aiptek",
+ .probe = aiptek_probe,
+ .disconnect = aiptek_disconnect,
+--- gregkh-2.6.orig/drivers/usb/input/appletouch.c
++++ gregkh-2.6/drivers/usb/input/appletouch.c
+@@ -452,7 +452,6 @@ static int atp_resume(struct usb_interfa
+ }
+
+ static struct usb_driver atp_driver = {
+- .owner = THIS_MODULE,
+ .name = "appletouch",
+ .probe = atp_probe,
+ .disconnect = atp_disconnect,
+--- gregkh-2.6.orig/drivers/usb/input/ati_remote.c
++++ gregkh-2.6/drivers/usb/input/ati_remote.c
+@@ -295,7 +295,6 @@ static void ati_remote_disconnect (struc
+
+ /* usb specific object to register with the usb subsystem */
+ static struct usb_driver ati_remote_driver = {
+- .owner = THIS_MODULE,
+ .name = "ati_remote",
+ .probe = ati_remote_probe,
+ .disconnect = ati_remote_disconnect,
+--- gregkh-2.6.orig/drivers/usb/input/hid-core.c
++++ gregkh-2.6/drivers/usb/input/hid-core.c
+@@ -1928,7 +1928,6 @@ static struct usb_device_id hid_usb_ids
+ MODULE_DEVICE_TABLE (usb, hid_usb_ids);
+
+ static struct usb_driver hid_driver = {
+- .owner = THIS_MODULE,
+ .name = "usbhid",
+ .probe = hid_probe,
+ .disconnect = hid_disconnect,
+--- gregkh-2.6.orig/drivers/usb/input/hiddev.c
++++ gregkh-2.6/drivers/usb/input/hiddev.c
+@@ -826,7 +826,6 @@ static int hiddev_usbd_probe(struct usb_
+
+
+ static /* const */ struct usb_driver hiddev_driver = {
+- .owner = THIS_MODULE,
+ .name = "hiddev",
+ .probe = hiddev_usbd_probe,
+ };
+--- gregkh-2.6.orig/drivers/usb/input/itmtouch.c
++++ gregkh-2.6/drivers/usb/input/itmtouch.c
+@@ -250,7 +250,6 @@ static void itmtouch_disconnect(struct u
+ MODULE_DEVICE_TABLE(usb, itmtouch_ids);
+
+ static struct usb_driver itmtouch_driver = {
+- .owner = THIS_MODULE,
+ .name = "itmtouch",
+ .probe = itmtouch_probe,
+ .disconnect = itmtouch_disconnect,
+--- gregkh-2.6.orig/drivers/usb/input/kbtab.c
++++ gregkh-2.6/drivers/usb/input/kbtab.c
+@@ -197,7 +197,6 @@ static void kbtab_disconnect(struct usb_
+ }
+
+ static struct usb_driver kbtab_driver = {
+- .owner = THIS_MODULE,
+ .name = "kbtab",
+ .probe = kbtab_probe,
+ .disconnect = kbtab_disconnect,
+--- gregkh-2.6.orig/drivers/usb/input/keyspan_remote.c
++++ gregkh-2.6/drivers/usb/input/keyspan_remote.c
+@@ -559,7 +559,6 @@ static void keyspan_disconnect(struct us
+ */
+ static struct usb_driver keyspan_driver =
+ {
+- .owner = THIS_MODULE,
+ .name = "keyspan_remote",
+ .probe = keyspan_probe,
+ .disconnect = keyspan_disconnect,
+--- gregkh-2.6.orig/drivers/usb/input/mtouchusb.c
++++ gregkh-2.6/drivers/usb/input/mtouchusb.c
+@@ -310,7 +310,6 @@ static void mtouchusb_disconnect(struct
+ MODULE_DEVICE_TABLE(usb, mtouchusb_devices);
+
+ static struct usb_driver mtouchusb_driver = {
+- .owner = THIS_MODULE,
+ .name = "mtouchusb",
+ .probe = mtouchusb_probe,
+ .disconnect = mtouchusb_disconnect,
+--- gregkh-2.6.orig/drivers/usb/input/powermate.c
++++ gregkh-2.6/drivers/usb/input/powermate.c
+@@ -441,7 +441,6 @@ static struct usb_device_id powermate_de
+ MODULE_DEVICE_TABLE (usb, powermate_devices);
+
+ static struct usb_driver powermate_driver = {
+- .owner = THIS_MODULE,
+ .name = "powermate",
+ .probe = powermate_probe,
+ .disconnect = powermate_disconnect,
+--- gregkh-2.6.orig/drivers/usb/input/touchkitusb.c
++++ gregkh-2.6/drivers/usb/input/touchkitusb.c
+@@ -267,7 +267,6 @@ static void touchkit_disconnect(struct u
+ MODULE_DEVICE_TABLE(usb, touchkit_devices);
+
+ static struct usb_driver touchkit_driver = {
+- .owner = THIS_MODULE,
+ .name = "touchkitusb",
+ .probe = touchkit_probe,
+ .disconnect = touchkit_disconnect,
+--- gregkh-2.6.orig/drivers/usb/input/usbkbd.c
++++ gregkh-2.6/drivers/usb/input/usbkbd.c
+@@ -345,7 +345,6 @@ static struct usb_device_id usb_kbd_id_t
+ MODULE_DEVICE_TABLE (usb, usb_kbd_id_table);
+
+ static struct usb_driver usb_kbd_driver = {
+- .owner = THIS_MODULE,
+ .name = "usbkbd",
+ .probe = usb_kbd_probe,
+ .disconnect = usb_kbd_disconnect,
+--- gregkh-2.6.orig/drivers/usb/input/usbmouse.c
++++ gregkh-2.6/drivers/usb/input/usbmouse.c
+@@ -226,7 +226,6 @@ static struct usb_device_id usb_mouse_id
+ MODULE_DEVICE_TABLE (usb, usb_mouse_id_table);
+
+ static struct usb_driver usb_mouse_driver = {
+- .owner = THIS_MODULE,
+ .name = "usbmouse",
+ .probe = usb_mouse_probe,
+ .disconnect = usb_mouse_disconnect,
+--- gregkh-2.6.orig/drivers/usb/input/wacom.c
++++ gregkh-2.6/drivers/usb/input/wacom.c
+@@ -945,7 +945,6 @@ static void wacom_disconnect(struct usb_
+ }
+
+ static struct usb_driver wacom_driver = {
+- .owner = THIS_MODULE,
+ .name = "wacom",
+ .probe = wacom_probe,
+ .disconnect = wacom_disconnect,
+--- gregkh-2.6.orig/drivers/usb/input/xpad.c
++++ gregkh-2.6/drivers/usb/input/xpad.c
+@@ -316,7 +316,6 @@ static void xpad_disconnect(struct usb_i
+ }
+
+ static struct usb_driver xpad_driver = {
+- .owner = THIS_MODULE,
+ .name = "xpad",
+ .probe = xpad_probe,
+ .disconnect = xpad_disconnect,
+--- gregkh-2.6.orig/drivers/usb/input/yealink.c
++++ gregkh-2.6/drivers/usb/input/yealink.c
+@@ -987,7 +987,6 @@ static int usb_probe(struct usb_interfac
+ }
+
+ static struct usb_driver yealink_driver = {
+- .owner = THIS_MODULE,
+ .name = "yealink",
+ .probe = usb_probe,
+ .disconnect = usb_disconnect,
+--- gregkh-2.6.orig/drivers/usb/image/mdc800.c
++++ gregkh-2.6/drivers/usb/image/mdc800.c
+@@ -962,7 +962,6 @@ MODULE_DEVICE_TABLE (usb, mdc800_table);
+ */
+ static struct usb_driver mdc800_usb_driver =
+ {
+- .owner = THIS_MODULE,
+ .name = "mdc800",
+ .probe = mdc800_usb_probe,
+ .disconnect = mdc800_usb_disconnect,
+--- gregkh-2.6.orig/drivers/usb/image/microtek.c
++++ gregkh-2.6/drivers/usb/image/microtek.c
+@@ -160,7 +160,6 @@ static void mts_usb_disconnect(struct us
+ static struct usb_device_id mts_usb_ids [];
+
+ static struct usb_driver mts_usb_driver = {
+- .owner = THIS_MODULE,
+ .name = "microtekX6",
+ .probe = mts_usb_probe,
+ .disconnect = mts_usb_disconnect,
+--- gregkh-2.6.orig/drivers/usb/media/dabusb.c
++++ gregkh-2.6/drivers/usb/media/dabusb.c
+@@ -812,7 +812,6 @@ static struct usb_device_id dabusb_ids [
+ MODULE_DEVICE_TABLE (usb, dabusb_ids);
+
+ static struct usb_driver dabusb_driver = {
+- .owner = THIS_MODULE,
+ .name = "dabusb",
+ .probe = dabusb_probe,
+ .disconnect = dabusb_disconnect,
+--- gregkh-2.6.orig/drivers/usb/media/dsbr100.c
++++ gregkh-2.6/drivers/usb/media/dsbr100.c
+@@ -150,7 +150,6 @@ MODULE_DEVICE_TABLE (usb, usb_dsbr100_de
+
+ /* USB subsystem interface */
+ static struct usb_driver usb_dsbr100_driver = {
+- .owner = THIS_MODULE,
+ .name = "dsbr100",
+ .probe = usb_dsbr100_probe,
+ .disconnect = usb_dsbr100_disconnect,
+--- gregkh-2.6.orig/drivers/usb/media/ov511.c
++++ gregkh-2.6/drivers/usb/media/ov511.c
+@@ -6008,7 +6008,6 @@ ov51x_disconnect(struct usb_interface *i
+ }
+
+ static struct usb_driver ov511_driver = {
+- .owner = THIS_MODULE,
+ .name = "ov511",
+ .id_table = device_table,
+ .probe = ov51x_probe,
+--- gregkh-2.6.orig/drivers/usb/media/se401.c
++++ gregkh-2.6/drivers/usb/media/se401.c
+@@ -1401,7 +1401,6 @@ static void se401_disconnect(struct usb_
+ }
+
+ static struct usb_driver se401_driver = {
+- .owner = THIS_MODULE,
+ .name = "se401",
+ .id_table = device_table,
+ .probe = se401_probe,
+--- gregkh-2.6.orig/drivers/usb/media/sn9c102_core.c
++++ gregkh-2.6/drivers/usb/media/sn9c102_core.c
+@@ -2711,7 +2711,6 @@ static void sn9c102_usb_disconnect(struc
+
+
+ static struct usb_driver sn9c102_usb_driver = {
+- .owner = THIS_MODULE,
+ .name = "sn9c102",
+ .id_table = sn9c102_id_table,
+ .probe = sn9c102_usb_probe,
+--- gregkh-2.6.orig/drivers/usb/media/stv680.c
++++ gregkh-2.6/drivers/usb/media/stv680.c
+@@ -1477,7 +1477,6 @@ static void stv680_disconnect (struct us
+ }
+
+ static struct usb_driver stv680_driver = {
+- .owner = THIS_MODULE,
+ .name = "stv680",
+ .probe = stv680_probe,
+ .disconnect = stv680_disconnect,
+--- gregkh-2.6.orig/drivers/usb/media/vicam.c
++++ gregkh-2.6/drivers/usb/media/vicam.c
+@@ -1257,7 +1257,6 @@ static struct usb_device_id vicam_table[
+ MODULE_DEVICE_TABLE(usb, vicam_table);
+
+ static struct usb_driver vicam_driver = {
+- .owner = THIS_MODULE,
+ .name = "vicam",
+ .probe = vicam_probe,
+ .disconnect = vicam_disconnect,
+--- gregkh-2.6.orig/drivers/usb/media/pwc/pwc-if.c
++++ gregkh-2.6/drivers/usb/media/pwc/pwc-if.c
+@@ -111,7 +111,6 @@ static int usb_pwc_probe(struct usb_inte
+ static void usb_pwc_disconnect(struct usb_interface *intf);
+
+ static struct usb_driver pwc_driver = {
+- .owner = THIS_MODULE,
+ .name = "Philips webcam", /* name */
+ .id_table = pwc_device_table,
+ .probe = usb_pwc_probe, /* probe() */
+--- gregkh-2.6.orig/drivers/usb/storage/libusual.c
++++ gregkh-2.6/drivers/usb/storage/libusual.c
+@@ -155,7 +155,6 @@ static void usu_disconnect(struct usb_in
+ }
+
+ static struct usb_driver usu_driver = {
+- .owner = THIS_MODULE,
+ .name = "libusual",
+ .probe = usu_probe,
+ .disconnect = usu_disconnect,
+--- gregkh-2.6.orig/drivers/usb/storage/usb.c
++++ gregkh-2.6/drivers/usb/storage/usb.c
+@@ -1000,7 +1000,6 @@ static void storage_disconnect(struct us
+ ***********************************************************************/
+
+ static struct usb_driver usb_storage_driver = {
+- .owner = THIS_MODULE,
+ .name = "usb-storage",
+ .probe = storage_probe,
+ .disconnect = storage_disconnect,
+--- gregkh-2.6.orig/drivers/usb/misc/auerswald.c
++++ gregkh-2.6/drivers/usb/misc/auerswald.c
+@@ -2103,7 +2103,6 @@ MODULE_DEVICE_TABLE (usb, auerswald_ids)
+
+ /* Standard usb driver struct */
+ static struct usb_driver auerswald_driver = {
+- .owner = THIS_MODULE,
+ .name = "auerswald",
+ .probe = auerswald_probe,
+ .disconnect = auerswald_disconnect,
+--- gregkh-2.6.orig/drivers/usb/misc/cytherm.c
++++ gregkh-2.6/drivers/usb/misc/cytherm.c
+@@ -50,7 +50,6 @@ static void cytherm_disconnect(struct us
+
+ /* usb specific object needed to register this driver with the usb subsystem */
+ static struct usb_driver cytherm_driver = {
+- .owner = THIS_MODULE,
+ .name = "cytherm",
+ .probe = cytherm_probe,
+ .disconnect = cytherm_disconnect,
+--- gregkh-2.6.orig/drivers/usb/misc/emi26.c
++++ gregkh-2.6/drivers/usb/misc/emi26.c
+@@ -227,7 +227,6 @@ static void emi26_disconnect(struct usb_
+ }
+
+ static struct usb_driver emi26_driver = {
+- .owner = THIS_MODULE,
+ .name = "emi26 - firmware loader",
+ .probe = emi26_probe,
+ .disconnect = emi26_disconnect,
+--- gregkh-2.6.orig/drivers/usb/misc/emi62.c
++++ gregkh-2.6/drivers/usb/misc/emi62.c
+@@ -266,7 +266,6 @@ static void emi62_disconnect(struct usb_
+ }
+
+ static struct usb_driver emi62_driver = {
+- .owner = THIS_MODULE,
+ .name = "emi62 - firmware loader",
+ .probe = emi62_probe,
+ .disconnect = emi62_disconnect,
+--- gregkh-2.6.orig/drivers/usb/misc/idmouse.c
++++ gregkh-2.6/drivers/usb/misc/idmouse.c
+@@ -114,7 +114,6 @@ static struct usb_class_driver idmouse_c
+
+ /* usb specific object needed to register this driver with the usb subsystem */
+ static struct usb_driver idmouse_driver = {
+- .owner = THIS_MODULE,
+ .name = DRIVER_SHORT,
+ .probe = idmouse_probe,
+ .disconnect = idmouse_disconnect,
+--- gregkh-2.6.orig/drivers/usb/misc/ldusb.c
++++ gregkh-2.6/drivers/usb/misc/ldusb.c
+@@ -763,7 +763,6 @@ static void ld_usb_disconnect(struct usb
+
+ /* usb specific object needed to register this driver with the usb subsystem */
+ static struct usb_driver ld_usb_driver = {
+- .owner = THIS_MODULE,
+ .name = "ldusb",
+ .probe = ld_usb_probe,
+ .disconnect = ld_usb_disconnect,
+--- gregkh-2.6.orig/drivers/usb/misc/legousbtower.c
++++ gregkh-2.6/drivers/usb/misc/legousbtower.c
+@@ -282,7 +282,6 @@ static struct usb_class_driver tower_cla
+
+ /* usb specific object needed to register this driver with the usb subsystem */
+ static struct usb_driver tower_driver = {
+- .owner = THIS_MODULE,
+ .name = "legousbtower",
+ .probe = tower_probe,
+ .disconnect = tower_disconnect,
+--- gregkh-2.6.orig/drivers/usb/misc/phidgetkit.c
++++ gregkh-2.6/drivers/usb/misc/phidgetkit.c
+@@ -555,7 +555,6 @@ static void interfacekit_disconnect(stru
+ }
+
+ static struct usb_driver interfacekit_driver = {
+- .owner = THIS_MODULE,
+ .name = "phidgetkit",
+ .probe = interfacekit_probe,
+ .disconnect = interfacekit_disconnect,
+--- gregkh-2.6.orig/drivers/usb/misc/phidgetservo.c
++++ gregkh-2.6/drivers/usb/misc/phidgetservo.c
+@@ -306,7 +306,6 @@ servo_disconnect(struct usb_interface *i
+ }
+
+ static struct usb_driver servo_driver = {
+- .owner = THIS_MODULE,
+ .name = "phidgetservo",
+ .probe = servo_probe,
+ .disconnect = servo_disconnect,
+--- gregkh-2.6.orig/drivers/usb/misc/rio500.c
++++ gregkh-2.6/drivers/usb/misc/rio500.c
+@@ -522,7 +522,6 @@ static struct usb_device_id rio_table []
+ MODULE_DEVICE_TABLE (usb, rio_table);
+
+ static struct usb_driver rio_driver = {
+- .owner = THIS_MODULE,
+ .name = "rio500",
+ .probe = probe_rio,
+ .disconnect = disconnect_rio,
+--- gregkh-2.6.orig/drivers/usb/misc/usblcd.c
++++ gregkh-2.6/drivers/usb/misc/usblcd.c
+@@ -371,7 +371,6 @@ static void lcd_disconnect(struct usb_in
+ }
+
+ static struct usb_driver lcd_driver = {
+- .owner = THIS_MODULE,
+ .name = "usblcd",
+ .probe = lcd_probe,
+ .disconnect = lcd_disconnect,
+--- gregkh-2.6.orig/drivers/usb/misc/usbled.c
++++ gregkh-2.6/drivers/usb/misc/usbled.c
+@@ -148,7 +148,6 @@ static void led_disconnect(struct usb_in
+ }
+
+ static struct usb_driver led_driver = {
+- .owner = THIS_MODULE,
+ .name = "usbled",
+ .probe = led_probe,
+ .disconnect = led_disconnect,
+--- gregkh-2.6.orig/drivers/usb/misc/usbtest.c
++++ gregkh-2.6/drivers/usb/misc/usbtest.c
+@@ -2134,7 +2134,6 @@ static struct usb_device_id id_table []
+ MODULE_DEVICE_TABLE (usb, id_table);
+
+ static struct usb_driver usbtest_driver = {
+- .owner = THIS_MODULE,
+ .name = "usbtest",
+ .id_table = id_table,
+ .probe = usbtest_probe,
+--- gregkh-2.6.orig/drivers/usb/misc/uss720.c
++++ gregkh-2.6/drivers/usb/misc/uss720.c
+@@ -780,7 +780,6 @@ MODULE_DEVICE_TABLE (usb, uss720_table);
+
+
+ static struct usb_driver uss720_driver = {
+- .owner = THIS_MODULE,
+ .name = "uss720",
+ .probe = uss720_probe,
+ .disconnect = uss720_disconnect,
+--- gregkh-2.6.orig/drivers/usb/misc/sisusbvga/sisusb.c
++++ gregkh-2.6/drivers/usb/misc/sisusbvga/sisusb.c
+@@ -3489,7 +3489,6 @@ static struct usb_device_id sisusb_table
+ MODULE_DEVICE_TABLE (usb, sisusb_table);
+
+ static struct usb_driver sisusb_driver = {
+- .owner = THIS_MODULE,
+ .name = "sisusb",
+ .probe = sisusb_probe,
+ .disconnect = sisusb_disconnect,
+--- gregkh-2.6.orig/drivers/usb/net/asix.c
++++ gregkh-2.6/drivers/usb/net/asix.c
+@@ -918,7 +918,6 @@ static const struct usb_device_id produc
+ MODULE_DEVICE_TABLE(usb, products);
+
+ static struct usb_driver asix_driver = {
+- .owner = THIS_MODULE,
+ .name = "asix",
+ .id_table = products,
+ .probe = usbnet_probe,
+--- gregkh-2.6.orig/drivers/usb/net/catc.c
++++ gregkh-2.6/drivers/usb/net/catc.c
+@@ -934,7 +934,6 @@ static struct usb_device_id catc_id_tabl
+ MODULE_DEVICE_TABLE(usb, catc_id_table);
+
+ static struct usb_driver catc_driver = {
+- .owner = THIS_MODULE,
+ .name = driver_name,
+ .probe = catc_probe,
+ .disconnect = catc_disconnect,
+--- gregkh-2.6.orig/drivers/usb/net/cdc_ether.c
++++ gregkh-2.6/drivers/usb/net/cdc_ether.c
+@@ -476,7 +476,6 @@ static const struct usb_device_id produc
+ MODULE_DEVICE_TABLE(usb, products);
+
+ static struct usb_driver cdc_driver = {
+- .owner = THIS_MODULE,
+ .name = "cdc_ether",
+ .id_table = products,
+ .probe = usbnet_probe,
+--- gregkh-2.6.orig/drivers/usb/net/cdc_subset.c
++++ gregkh-2.6/drivers/usb/net/cdc_subset.c
+@@ -306,7 +306,6 @@ MODULE_DEVICE_TABLE(usb, products);
+ /*-------------------------------------------------------------------------*/
+
+ static struct usb_driver cdc_subset_driver = {
+- .owner = THIS_MODULE,
+ .name = "cdc_subset",
+ .probe = usbnet_probe,
+ .suspend = usbnet_suspend,
+--- gregkh-2.6.orig/drivers/usb/net/gl620a.c
++++ gregkh-2.6/drivers/usb/net/gl620a.c
+@@ -377,7 +377,6 @@ static const struct usb_device_id produc
+ MODULE_DEVICE_TABLE(usb, products);
+
+ static struct usb_driver gl620a_driver = {
+- .owner = THIS_MODULE,
+ .name = "gl620a",
+ .id_table = products,
+ .probe = usbnet_probe,
+--- gregkh-2.6.orig/drivers/usb/net/kaweth.c
++++ gregkh-2.6/drivers/usb/net/kaweth.c
+@@ -175,7 +175,6 @@ MODULE_DEVICE_TABLE (usb, usb_klsi_table
+ * kaweth_driver
+ ****************************************************************/
+ static struct usb_driver kaweth_driver = {
+- .owner = THIS_MODULE,
+ .name = driver_name,
+ .probe = kaweth_probe,
+ .disconnect = kaweth_disconnect,
+--- gregkh-2.6.orig/drivers/usb/net/net1080.c
++++ gregkh-2.6/drivers/usb/net/net1080.c
+@@ -593,7 +593,6 @@ static const struct usb_device_id produc
+ MODULE_DEVICE_TABLE(usb, products);
+
+ static struct usb_driver net1080_driver = {
+- .owner = THIS_MODULE,
+ .name = "net1080",
+ .id_table = products,
+ .probe = usbnet_probe,
+--- gregkh-2.6.orig/drivers/usb/net/plusb.c
++++ gregkh-2.6/drivers/usb/net/plusb.c
+@@ -127,7 +127,6 @@ static const struct usb_device_id produc
+ MODULE_DEVICE_TABLE(usb, products);
+
+ static struct usb_driver plusb_driver = {
+- .owner = THIS_MODULE,
+ .name = "plusb",
+ .id_table = products,
+ .probe = usbnet_probe,
+--- gregkh-2.6.orig/drivers/usb/net/rndis_host.c
++++ gregkh-2.6/drivers/usb/net/rndis_host.c
+@@ -586,7 +586,6 @@ static const struct usb_device_id produc
+ MODULE_DEVICE_TABLE(usb, products);
+
+ static struct usb_driver rndis_driver = {
+- .owner = THIS_MODULE,
+ .name = "rndis_host",
+ .id_table = products,
+ .probe = usbnet_probe,
+--- gregkh-2.6.orig/drivers/usb/net/rtl8150.c
++++ gregkh-2.6/drivers/usb/net/rtl8150.c
+@@ -177,7 +177,6 @@ static int rtl8150_probe(struct usb_inte
+ static const char driver_name [] = "rtl8150";
+
+ static struct usb_driver rtl8150_driver = {
+- .owner = THIS_MODULE,
+ .name = driver_name,
+ .probe = rtl8150_probe,
+ .disconnect = rtl8150_disconnect,
+--- gregkh-2.6.orig/drivers/usb/net/zaurus.c
++++ gregkh-2.6/drivers/usb/net/zaurus.c
+@@ -357,7 +357,6 @@ static const struct usb_device_id produc
+ MODULE_DEVICE_TABLE(usb, products);
+
+ static struct usb_driver zaurus_driver = {
+- .owner = THIS_MODULE,
+ .name = "zaurus",
+ .id_table = products,
+ .probe = usbnet_probe,
+--- gregkh-2.6.orig/drivers/usb/net/zd1201.c
++++ gregkh-2.6/drivers/usb/net/zd1201.c
+@@ -1923,7 +1923,6 @@ static int zd1201_resume(struct usb_inte
+ #endif
+
+ static struct usb_driver zd1201_usb = {
+- .owner = THIS_MODULE,
+ .name = "zd1201",
+ .probe = zd1201_probe,
+ .disconnect = zd1201_disconnect,
+--- gregkh-2.6.orig/drivers/block/ub.c
++++ gregkh-2.6/drivers/block/ub.c
+@@ -2460,7 +2460,6 @@ static void ub_disconnect(struct usb_int
+ }
+
+ static struct usb_driver ub_driver = {
+- .owner = THIS_MODULE,
+ .name = "ub",
+ .probe = ub_probe,
+ .disconnect = ub_disconnect,
+--- gregkh-2.6.orig/sound/usb/usbaudio.c
++++ gregkh-2.6/sound/usb/usbaudio.c
+@@ -1996,7 +1996,6 @@ static struct usb_device_id usb_audio_id
+ MODULE_DEVICE_TABLE (usb, usb_audio_ids);
+
+ static struct usb_driver usb_audio_driver = {
+- .owner = THIS_MODULE,
+ .name = "snd-usb-audio",
+ .probe = usb_audio_probe,
+ .disconnect = usb_audio_disconnect,
+--- gregkh-2.6.orig/drivers/bluetooth/bcm203x.c
++++ gregkh-2.6/drivers/bluetooth/bcm203x.c
+@@ -275,7 +275,6 @@ static void bcm203x_disconnect(struct us
+ }
+
+ static struct usb_driver bcm203x_driver = {
+- .owner = THIS_MODULE,
+ .name = "bcm203x",
+ .probe = bcm203x_probe,
+ .disconnect = bcm203x_disconnect,
+--- gregkh-2.6.orig/drivers/bluetooth/bfusb.c
++++ gregkh-2.6/drivers/bluetooth/bfusb.c
+@@ -768,7 +768,6 @@ static void bfusb_disconnect(struct usb_
+ }
+
+ static struct usb_driver bfusb_driver = {
+- .owner = THIS_MODULE,
+ .name = "bfusb",
+ .probe = bfusb_probe,
+ .disconnect = bfusb_disconnect,
+--- gregkh-2.6.orig/drivers/bluetooth/bpa10x.c
++++ gregkh-2.6/drivers/bluetooth/bpa10x.c
+@@ -619,7 +619,6 @@ static void bpa10x_disconnect(struct usb
+ }
+
+ static struct usb_driver bpa10x_driver = {
+- .owner = THIS_MODULE,
+ .name = "bpa10x",
+ .probe = bpa10x_probe,
+ .disconnect = bpa10x_disconnect,
+--- gregkh-2.6.orig/drivers/bluetooth/hci_usb.c
++++ gregkh-2.6/drivers/bluetooth/hci_usb.c
+@@ -1044,7 +1044,6 @@ static void hci_usb_disconnect(struct us
+ }
+
+ static struct usb_driver hci_usb_driver = {
+- .owner = THIS_MODULE,
+ .name = "hci_usb",
+ .probe = hci_usb_probe,
+ .disconnect = hci_usb_disconnect,
+--- gregkh-2.6.orig/sound/usb/usx2y/usbusx2y.c
++++ gregkh-2.6/sound/usb/usx2y/usbusx2y.c
+@@ -409,7 +409,6 @@ static void snd_usX2Y_disconnect(struct
+
+ MODULE_DEVICE_TABLE(usb, snd_usX2Y_usb_id_table);
+ static struct usb_driver snd_usX2Y_usb_driver = {
+- .owner = THIS_MODULE,
+ .name = "snd-usb-usx2y",
+ .probe = snd_usX2Y_probe,
+ .disconnect = snd_usX2Y_disconnect,
+--- gregkh-2.6.orig/drivers/media/dvb/b2c2/flexcop-usb.c
++++ gregkh-2.6/drivers/media/dvb/b2c2/flexcop-usb.c
+@@ -544,7 +544,6 @@ static struct usb_device_id flexcop_usb_
+
+ /* usb specific object needed to register this driver with the usb subsystem */
+ static struct usb_driver flexcop_usb_driver = {
+- .owner = THIS_MODULE,
+ .name = "b2c2_flexcop_usb",
+ .probe = flexcop_usb_probe,
+ .disconnect = flexcop_usb_disconnect,
+--- gregkh-2.6.orig/drivers/media/dvb/cinergyT2/cinergyT2.c
++++ gregkh-2.6/drivers/media/dvb/cinergyT2/cinergyT2.c
+@@ -986,7 +986,6 @@ static const struct usb_device_id cinerg
+ MODULE_DEVICE_TABLE(usb, cinergyt2_table);
+
+ static struct usb_driver cinergyt2_driver = {
+- .owner = THIS_MODULE,
+ .name = "cinergyT2",
+ .probe = cinergyt2_probe,
+ .disconnect = cinergyt2_disconnect,
+--- gregkh-2.6.orig/drivers/media/dvb/dvb-usb/a800.c
++++ gregkh-2.6/drivers/media/dvb/dvb-usb/a800.c
+@@ -144,7 +144,6 @@ static struct dvb_usb_properties a800_pr
+ };
+
+ static struct usb_driver a800_driver = {
+- .owner = THIS_MODULE,
+ .name = "dvb_usb_a800",
+ .probe = a800_probe,
+ .disconnect = dvb_usb_device_exit,
+--- gregkh-2.6.orig/drivers/media/dvb/dvb-usb/cxusb.c
++++ gregkh-2.6/drivers/media/dvb/dvb-usb/cxusb.c
+@@ -241,7 +241,6 @@ static struct dvb_usb_properties cxusb_p
+ };
+
+ static struct usb_driver cxusb_driver = {
+- .owner = THIS_MODULE,
+ .name = "dvb_usb_cxusb",
+ .probe = cxusb_probe,
+ .disconnect = dvb_usb_device_exit,
+--- gregkh-2.6.orig/drivers/media/dvb/dvb-usb/dibusb-mb.c
++++ gregkh-2.6/drivers/media/dvb/dvb-usb/dibusb-mb.c
+@@ -373,7 +373,6 @@ static struct dvb_usb_properties artec_t
+ };
+
+ static struct usb_driver dibusb_driver = {
+- .owner = THIS_MODULE,
+ .name = "dvb_usb_dibusb_mb",
+ .probe = dibusb_probe,
+ .disconnect = dvb_usb_device_exit,
+--- gregkh-2.6.orig/drivers/media/dvb/dvb-usb/dibusb-mc.c
++++ gregkh-2.6/drivers/media/dvb/dvb-usb/dibusb-mc.c
+@@ -82,7 +82,6 @@ static struct dvb_usb_properties dibusb_
+ };
+
+ static struct usb_driver dibusb_mc_driver = {
+- .owner = THIS_MODULE,
+ .name = "dvb_usb_dibusb_mc",
+ .probe = dibusb_mc_probe,
+ .disconnect = dvb_usb_device_exit,
+--- gregkh-2.6.orig/drivers/media/dvb/dvb-usb/digitv.c
++++ gregkh-2.6/drivers/media/dvb/dvb-usb/digitv.c
+@@ -233,7 +233,6 @@ static struct dvb_usb_properties digitv_
+ };
+
+ static struct usb_driver digitv_driver = {
+- .owner = THIS_MODULE,
+ .name = "dvb_usb_digitv",
+ .probe = digitv_probe,
+ .disconnect = dvb_usb_device_exit,
+--- gregkh-2.6.orig/drivers/media/dvb/dvb-usb/dtt200u.c
++++ gregkh-2.6/drivers/media/dvb/dvb-usb/dtt200u.c
+@@ -198,7 +198,6 @@ static struct dvb_usb_properties wt220u_
+
+ /* usb specific object needed to register this driver with the usb subsystem */
+ static struct usb_driver dtt200u_usb_driver = {
+- .owner = THIS_MODULE,
+ .name = "dvb_usb_dtt200u",
+ .probe = dtt200u_usb_probe,
+ .disconnect = dvb_usb_device_exit,
+--- gregkh-2.6.orig/drivers/media/dvb/dvb-usb/nova-t-usb2.c
++++ gregkh-2.6/drivers/media/dvb/dvb-usb/nova-t-usb2.c
+@@ -202,7 +202,6 @@ static struct dvb_usb_properties nova_t_
+ };
+
+ static struct usb_driver nova_t_driver = {
+- .owner = THIS_MODULE,
+ .name = "dvb_usb_nova_t_usb2",
+ .probe = nova_t_probe,
+ .disconnect = dvb_usb_device_exit,
+--- gregkh-2.6.orig/drivers/media/dvb/dvb-usb/umt-010.c
++++ gregkh-2.6/drivers/media/dvb/dvb-usb/umt-010.c
+@@ -128,7 +128,6 @@ static struct dvb_usb_properties umt_pro
+ };
+
+ static struct usb_driver umt_driver = {
+- .owner = THIS_MODULE,
+ .name = "dvb_usb_umt_010",
+ .probe = umt_probe,
+ .disconnect = dvb_usb_device_exit,
+--- gregkh-2.6.orig/drivers/media/dvb/dvb-usb/vp702x.c
++++ gregkh-2.6/drivers/media/dvb/dvb-usb/vp702x.c
+@@ -256,7 +256,6 @@ static struct dvb_usb_properties vp702x_
+
+ /* usb specific object needed to register this driver with the usb subsystem */
+ static struct usb_driver vp702x_usb_driver = {
+- .owner = THIS_MODULE,
+ .name = "dvb-usb-vp702x",
+ .probe = vp702x_usb_probe,
+ .disconnect = dvb_usb_device_exit,
+--- gregkh-2.6.orig/drivers/media/dvb/dvb-usb/vp7045.c
++++ gregkh-2.6/drivers/media/dvb/dvb-usb/vp7045.c
+@@ -253,7 +253,6 @@ static struct dvb_usb_properties vp7045_
+
+ /* usb specific object needed to register this driver with the usb subsystem */
+ static struct usb_driver vp7045_usb_driver = {
+- .owner = THIS_MODULE,
+ .name = "dvb_usb_vp7045",
+ .probe = vp7045_usb_probe,
+ .disconnect = dvb_usb_device_exit,
+--- gregkh-2.6.orig/drivers/isdn/hisax/hfc_usb.c
++++ gregkh-2.6/drivers/isdn/hisax/hfc_usb.c
+@@ -1715,7 +1715,6 @@ hfc_usb_disconnect(struct usb_interface
+ /* our driver information structure */
+ /************************************/
+ static struct usb_driver hfc_drv = {
+- .owner = THIS_MODULE,
+ .name = "hfc_usb",
+ .id_table = hfcusb_idtab,
+ .probe = hfc_usb_probe,
+--- gregkh-2.6.orig/drivers/isdn/hisax/st5481_init.c
++++ gregkh-2.6/drivers/isdn/hisax/st5481_init.c
+@@ -180,7 +180,6 @@ static struct usb_device_id st5481_ids[]
+ MODULE_DEVICE_TABLE (usb, st5481_ids);
+
+ static struct usb_driver st5481_usb_driver = {
+- .owner = THIS_MODULE,
+ .name = "st5481_usb",
+ .probe = probe_st5481,
+ .disconnect = disconnect_st5481,
+--- gregkh-2.6.orig/drivers/media/video/cpia_usb.c
++++ gregkh-2.6/drivers/media/video/cpia_usb.c
+@@ -582,7 +582,6 @@ MODULE_LICENSE("GPL");
+
+
+ static struct usb_driver cpia_driver = {
+- .owner = THIS_MODULE,
+ .name = "cpia",
+ .probe = cpia_probe,
+ .disconnect = cpia_disconnect,
+--- gregkh-2.6.orig/drivers/media/video/em28xx/em28xx-video.c
++++ gregkh-2.6/drivers/media/video/em28xx/em28xx-video.c
+@@ -1895,7 +1895,6 @@ static void em28xx_usb_disconnect(struct
+ }
+
+ static struct usb_driver em28xx_usb_driver = {
+- .owner = THIS_MODULE,
+ .name = "em28xx",
+ .probe = em28xx_usb_probe,
+ .disconnect = em28xx_usb_disconnect,
+--- gregkh-2.6.orig/drivers/w1/dscore.c
++++ gregkh-2.6/drivers/w1/dscore.c
+@@ -52,7 +52,6 @@ static int ds_send_control_cmd(struct ds
+
+
+ static struct usb_driver ds_driver = {
+- .owner = THIS_MODULE,
+ .name = "DS9490R",
+ .probe = ds_probe,
+ .disconnect = ds_disconnect,
+--- gregkh-2.6.orig/drivers/net/irda/irda-usb.c
++++ gregkh-2.6/drivers/net/irda/irda-usb.c
+@@ -1539,7 +1539,6 @@ static void irda_usb_disconnect(struct u
+ * USB device callbacks
+ */
+ static struct usb_driver irda_driver = {
+- .owner = THIS_MODULE,
+ .name = "irda-usb",
+ .probe = irda_usb_probe,
+ .disconnect = irda_usb_disconnect,
+--- gregkh-2.6.orig/drivers/net/irda/stir4200.c
++++ gregkh-2.6/drivers/net/irda/stir4200.c
+@@ -1152,7 +1152,6 @@ static int stir_resume(struct usb_interf
+ * USB device callbacks
+ */
+ static struct usb_driver irda_driver = {
+- .owner = THIS_MODULE,
+ .name = "stir4200",
+ .probe = stir_probe,
+ .disconnect = stir_disconnect,
+--- gregkh-2.6.orig/drivers/char/watchdog/pcwd_usb.c
++++ gregkh-2.6/drivers/char/watchdog/pcwd_usb.c
+@@ -151,7 +151,6 @@ static void usb_pcwd_disconnect (struct
+
+ /* usb specific object needed to register this driver with the usb subsystem */
+ static struct usb_driver usb_pcwd_driver = {
+- .owner = THIS_MODULE,
+ .name = DRIVER_NAME,
+ .probe = usb_pcwd_probe,
+ .disconnect = usb_pcwd_disconnect,
+--- gregkh-2.6.orig/drivers/input/joystick/iforce/iforce-usb.c
++++ gregkh-2.6/drivers/input/joystick/iforce/iforce-usb.c
+@@ -235,7 +235,6 @@ static struct usb_device_id iforce_usb_i
+ MODULE_DEVICE_TABLE (usb, iforce_usb_ids);
+
+ struct usb_driver iforce_usb_driver = {
+- .owner = THIS_MODULE,
+ .name = "iforce",
+ .probe = iforce_usb_probe,
+ .disconnect = iforce_usb_disconnect,
diff --git a/usb/usb-driver-owner.patch b/usb/usb-driver-owner.patch
new file mode 100644
index 0000000000000..914ced3cc77a3
--- /dev/null
+++ b/usb/usb-driver-owner.patch
@@ -0,0 +1,71 @@
+From foo@baz.org Tue Nov 22 09:58:23 2005
+Date: Mon, 21 Nov 2005 14:53:03 -0800
+From: Greg Kroah-Hartman <gregkh@suse.de>
+Subject: USB: make registering a usb driver automatically set the module owner
+
+This fixes the driver that forgot to set the module owner up. Now we
+can remove the unneeded pointer from the usb driver structure. The idea
+for how to do this was from Al Viro, who did this for the PCI drivers.
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/core/driver.c | 9 +++++----
+ include/linux/usb.h | 6 +++++-
+ 2 files changed, 10 insertions(+), 5 deletions(-)
+
+--- gregkh-2.6.orig/drivers/usb/core/driver.c
++++ gregkh-2.6/drivers/usb/core/driver.c
+@@ -404,8 +404,9 @@ int usb_device_match(struct device *dev,
+ }
+
+ /**
+- * usb_register - register a USB driver
++ * usb_register_driver - register a USB driver
+ * @new_driver: USB operations for the driver
++ * @owner: module owner of this driver.
+ *
+ * Registers a USB driver with the USB core. The list of unattached
+ * interfaces will be rescanned whenever a new driver is added, allowing
+@@ -416,7 +417,7 @@ int usb_device_match(struct device *dev,
+ * usb_register_dev() to enable that functionality. This function no longer
+ * takes care of that.
+ */
+-int usb_register(struct usb_driver *new_driver)
++int usb_register_driver(struct usb_driver *new_driver, struct module *owner)
+ {
+ int retval = 0;
+
+@@ -427,7 +428,7 @@ int usb_register(struct usb_driver *new_
+ new_driver->driver.bus = &usb_bus_type;
+ new_driver->driver.probe = usb_probe_interface;
+ new_driver->driver.remove = usb_unbind_interface;
+- new_driver->driver.owner = new_driver->owner;
++ new_driver->driver.owner = owner;
+ spin_lock_init(&new_driver->dynids.lock);
+ INIT_LIST_HEAD(&new_driver->dynids.list);
+
+@@ -447,7 +448,7 @@ int usb_register(struct usb_driver *new_
+
+ return retval;
+ }
+-EXPORT_SYMBOL_GPL(usb_register);
++EXPORT_SYMBOL_GPL(usb_register_driver);
+
+ /**
+ * usb_deregister - unregister a USB driver
+--- gregkh-2.6.orig/include/linux/usb.h
++++ gregkh-2.6/include/linux/usb.h
+@@ -624,7 +624,11 @@ struct usb_class_driver {
+ * use these in module_init()/module_exit()
+ * and don't forget MODULE_DEVICE_TABLE(usb, ...)
+ */
+-extern int usb_register(struct usb_driver *);
++int usb_register_driver(struct usb_driver *, struct module *);
++static inline int usb_register(struct usb_driver *driver)
++{
++ return usb_register_driver(driver, THIS_MODULE);
++}
+ extern void usb_deregister(struct usb_driver *);
+
+ extern int usb_register_dev(struct usb_interface *intf,
diff --git a/usb/usb-gotemp.patch b/usb/usb-gotemp.patch
index 8c0d2d3bbd63e..6b81c118a0723 100644
--- a/usb/usb-gotemp.patch
+++ b/usb/usb-gotemp.patch
@@ -1,8 +1,8 @@
drivers/usb/Makefile | 1
drivers/usb/misc/Kconfig | 10 +
drivers/usb/misc/Makefile | 1
- drivers/usb/misc/gotemp.c | 293 ++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 305 insertions(+)
+ drivers/usb/misc/gotemp.c | 292 ++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 304 insertions(+)
---
--- gregkh-2.6.orig/drivers/usb/misc/Kconfig
@@ -36,7 +36,7 @@
obj-$(CONFIG_USB_LD) += ldusb.o
--- /dev/null
+++ gregkh-2.6/drivers/usb/misc/gotemp.c
-@@ -0,0 +1,293 @@
+@@ -0,0 +1,292 @@
+/*
+ * USB GoTemp driver
+ *
@@ -302,7 +302,6 @@
+}
+
+static struct usb_driver gotemp_driver = {
-+ .owner = THIS_MODULE,
+ .name = "gotemp",
+ .probe = gotemp_probe,
+ .disconnect = gotemp_disconnect,