Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-01-05 22:25:13 -05:00
parent e7c3aad53d 46f25dffba
commit fed8bf19ec
1443 changed files with 93875 additions and 51230 deletions
--- a/drivers/usb/input/appletouch.c
+++ b/drivers/usb/input/appletouch.c
@@ -525,7 +525,6 @@ static int atp_resume(struct usb_interface *iface)
 }

 static struct usb_driver atp_driver = {
-	.owner		= THIS_MODULE,
 	.name		= "appletouch",
 	.probe		= atp_probe,
 	.disconnect	= atp_disconnect,