diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/media/dvb/dvb-usb/af9005.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/media/dvb/dvb-usb/af9005.h')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/af9005.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9005.h b/drivers/media/dvb/dvb-usb/af9005.h index 3c1fbd1c5d60..c71c77bd7f4b 100644 --- a/drivers/media/dvb/dvb-usb/af9005.h +++ b/drivers/media/dvb/dvb-usb/af9005.h | |||
| @@ -3490,7 +3490,7 @@ extern u8 regmask[8]; | |||
| 3490 | /* remote control decoder */ | 3490 | /* remote control decoder */ |
| 3491 | extern int af9005_rc_decode(struct dvb_usb_device *d, u8 * data, int len, | 3491 | extern int af9005_rc_decode(struct dvb_usb_device *d, u8 * data, int len, |
| 3492 | u32 * event, int *state); | 3492 | u32 * event, int *state); |
| 3493 | extern struct ir_scancode ir_codes_af9005_table[]; | 3493 | extern struct rc_map_table rc_map_af9005_table[]; |
| 3494 | extern int ir_codes_af9005_table_size; | 3494 | extern int rc_map_af9005_table_size; |
| 3495 | 3495 | ||
| 3496 | #endif | 3496 | #endif |