summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dvb-usb/dibusb.h
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2010-08-10 02:02:33 +0200
committerNeilBrown <neilb@suse.de>2010-08-10 02:02:33 +0200
commitfd8aa2c1811bf60ccb2d5de0579c6f62aec1772d (patch)
tree311567d03758afc3a93b4273fe172836e89bb01d /drivers/media/dvb/dvb-usb/dibusb.h
parentmd: clean up do_md_stop (diff)
parentMerge branch 'async' of macbook:git/btrfs-unstable (diff)
downloadlinux-fd8aa2c1811bf60ccb2d5de0579c6f62aec1772d.tar.xz
linux-fd8aa2c1811bf60ccb2d5de0579c6f62aec1772d.zip
Merge git://git.infradead.org/users/dwmw2/libraid-2.6 into for-linus
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dibusb.h')
-rw-r--r--drivers/media/dvb/dvb-usb/dibusb.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/dibusb.h b/drivers/media/dvb/dvb-usb/dibusb.h
index 3d50ac59088f..61a6bf389472 100644
--- a/drivers/media/dvb/dvb-usb/dibusb.h
+++ b/drivers/media/dvb/dvb-usb/dibusb.h
@@ -124,7 +124,7 @@ extern int dibusb2_0_power_ctrl(struct dvb_usb_device *, int);
#define DEFAULT_RC_INTERVAL 150
//#define DEFAULT_RC_INTERVAL 100000
-extern struct dvb_usb_rc_key ir_codes_dibusb_table[];
+extern struct ir_scancode ir_codes_dibusb_table[];
extern int dibusb_rc_query(struct dvb_usb_device *, u32 *, int *);
extern int dibusb_read_eeprom_byte(struct dvb_usb_device *, u8, u8 *);