diff options
author | Jody McIntyre <scjody@modernduck.com> | 2006-01-05 08:03:40 -0500 |
---|---|---|
committer | Jody McIntyre <scjody@modernduck.com> | 2006-01-05 08:03:40 -0500 |
commit | 0a75c23a009ff65f651532cecc16675d05f4de37 (patch) | |
tree | bdcd6158758fe1810f0ddddb80d2816779518688 /drivers/media/dvb/dvb-usb/dibusb-mc.c | |
parent | 34b8c399dc04c8e51f014b73458e654570698597 (diff) | |
parent | db9edfd7e339ca4113153d887e782dd05be5a9eb (diff) |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dibusb-mc.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/dibusb-mc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mc.c b/drivers/media/dvb/dvb-usb/dibusb-mc.c index 6a0912eab396..55802fba3c29 100644 --- a/drivers/media/dvb/dvb-usb/dibusb-mc.c +++ b/drivers/media/dvb/dvb-usb/dibusb-mc.c | |||
@@ -82,7 +82,6 @@ static struct dvb_usb_properties dibusb_mc_properties = { | |||
82 | }; | 82 | }; |
83 | 83 | ||
84 | static struct usb_driver dibusb_mc_driver = { | 84 | static struct usb_driver dibusb_mc_driver = { |
85 | .owner = THIS_MODULE, | ||
86 | .name = "dvb_usb_dibusb_mc", | 85 | .name = "dvb_usb_dibusb_mc", |
87 | .probe = dibusb_mc_probe, | 86 | .probe = dibusb_mc_probe, |
88 | .disconnect = dvb_usb_device_exit, | 87 | .disconnect = dvb_usb_device_exit, |