diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-12-07 04:57:19 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-12-07 04:57:19 -0500 |
| commit | 8d1413b28033c49c7f1a4d320e815d7a5531acee (patch) | |
| tree | b37281abef014cd60803b81c100388d7a475d49e /drivers/media/dvb/dvb-usb/dvb-usb.h | |
| parent | ed25ffa16434724f5ed825aa48734c7f3aefa203 (diff) | |
| parent | 620034c84d1d939717bdfbe02c51a3fee43541c3 (diff) | |
Merge branch 'master' into upstream
Conflicts:
drivers/net/netxen/netxen_nic.h
drivers/net/netxen/netxen_nic_main.c
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dvb-usb.h')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h b/drivers/media/dvb/dvb-usb/dvb-usb.h index 376c45a8e779..0d721731a524 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb.h +++ b/drivers/media/dvb/dvb-usb/dvb-usb.h | |||
| @@ -369,7 +369,7 @@ struct dvb_usb_device { | |||
| 369 | /* remote control */ | 369 | /* remote control */ |
| 370 | struct input_dev *rc_input_dev; | 370 | struct input_dev *rc_input_dev; |
| 371 | char rc_phys[64]; | 371 | char rc_phys[64]; |
| 372 | struct work_struct rc_query_work; | 372 | struct delayed_work rc_query_work; |
| 373 | u32 last_event; | 373 | u32 last_event; |
| 374 | int last_state; | 374 | int last_state; |
| 375 | 375 | ||