diff options
author | Tony Luck <tony.luck@intel.com> | 2005-07-08 11:52:42 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-07-08 11:52:42 -0400 |
commit | 88c3cdfdde3cf87e1831265ea4246430bef34fc9 (patch) | |
tree | caea510ffb2f81a5ea13b00ecb8a4146ad462048 /drivers/media/dvb/dvb-usb/nova-t-usb2.c | |
parent | 2b2c3750330325ae5071582b5c4dbdf1c8bc1e51 (diff) | |
parent | a92b7b80579fe68fe229892815c750f6652eb6a9 (diff) |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/media/dvb/dvb-usb/nova-t-usb2.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/nova-t-usb2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/nova-t-usb2.c b/drivers/media/dvb/dvb-usb/nova-t-usb2.c index 9d83781aef95..258a92bfbcc7 100644 --- a/drivers/media/dvb/dvb-usb/nova-t-usb2.c +++ b/drivers/media/dvb/dvb-usb/nova-t-usb2.c | |||
@@ -203,7 +203,7 @@ static struct dvb_usb_properties nova_t_properties = { | |||
203 | 203 | ||
204 | static struct usb_driver nova_t_driver = { | 204 | static struct usb_driver nova_t_driver = { |
205 | .owner = THIS_MODULE, | 205 | .owner = THIS_MODULE, |
206 | .name = "Hauppauge WinTV-NOVA-T usb2", | 206 | .name = "dvb_usb_nova_t_usb2", |
207 | .probe = nova_t_probe, | 207 | .probe = nova_t_probe, |
208 | .disconnect = dvb_usb_device_exit, | 208 | .disconnect = dvb_usb_device_exit, |
209 | .id_table = nova_t_table, | 209 | .id_table = nova_t_table, |