diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:50:09 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:50:09 -0400 |
| commit | 9dfb7808fb05643b0d06df7411b94d9546696bf1 (patch) | |
| tree | aa1a9cc1e79ae66f6cbb0fe39d79a80ca76331e8 /drivers/media/dvb/dvb-usb/dvb-usb.h | |
| parent | c45154a3b1fecdbb51b5462c9f730b44e62b83a5 (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dvb-usb.h')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h b/drivers/media/dvb/dvb-usb/dvb-usb.h index 0e4f1035b0dd..b4a1a98006c7 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb.h +++ b/drivers/media/dvb/dvb-usb/dvb-usb.h | |||
| @@ -300,7 +300,8 @@ struct dvb_usb_device { | |||
| 300 | int (*fe_init) (struct dvb_frontend *); | 300 | int (*fe_init) (struct dvb_frontend *); |
| 301 | 301 | ||
| 302 | /* remote control */ | 302 | /* remote control */ |
| 303 | struct input_dev rc_input_dev; | 303 | struct input_dev *rc_input_dev; |
| 304 | char rc_phys[64]; | ||
| 304 | struct work_struct rc_query_work; | 305 | struct work_struct rc_query_work; |
| 305 | u32 last_event; | 306 | u32 last_event; |
| 306 | int last_state; | 307 | int last_state; |