summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-05 01:25:44 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-05 01:25:44 +0100
commitc6c88bbde4d8b2ffe9886b7130b2e23781d424e5 (patch)
tree47c2b61983acc6fbc42d89813729b87bbaf2aed9 /drivers/char
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq (diff)
parent[PATCH] USB: fix usb-skeleton limit resource usage patch. (diff)
downloadlinux-c6c88bbde4d8b2ffe9886b7130b2e23781d424e5.tar.xz
linux-c6c88bbde4d8b2ffe9886b7130b2e23781d424e5.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/watchdog/pcwd_usb.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/watchdog/pcwd_usb.c b/drivers/char/watchdog/pcwd_usb.c
index 092e9b133750..1533f56baa42 100644
--- a/drivers/char/watchdog/pcwd_usb.c
+++ b/drivers/char/watchdog/pcwd_usb.c
@@ -151,7 +151,6 @@ static void usb_pcwd_disconnect (struct usb_interface *interface);
/* 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,