diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:58 -0800 |
| commit | f17578decc40df8fceff82b106582e30bdfb3189 (patch) | |
| tree | 911a435a2094ac03ae649f020237674224e4124a /drivers/media/dvb/dvb-usb/dvb-usb-common.h | |
| parent | 682e852e2638ed0aff84aa51181c9e5d2f939562 (diff) | |
| parent | cec418346e5a411e907293aba7cc21ac53c95834 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dvb-usb-common.h')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb-common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-common.h b/drivers/media/dvb/dvb-usb/dvb-usb-common.h index 7300489d3e2..a3460bf2d9f 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-common.h +++ b/drivers/media/dvb/dvb-usb/dvb-usb-common.h @@ -24,7 +24,7 @@ extern int dvb_usb_disable_rc_polling; #define deb_mem(args...) dprintk(dvb_usb_debug,0x80,args) /* commonly used methods */ -extern int usb_cypress_load_firmware(struct usb_device *, const char *, int); +extern int dvb_usb_download_firmware(struct usb_device *, struct dvb_usb_properties *); extern int dvb_usb_urb_submit(struct dvb_usb_device *); extern int dvb_usb_urb_kill(struct dvb_usb_device *); |