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/dibusb-mc.c | |
| 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/dibusb-mc.c')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/dibusb-mc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mc.c b/drivers/media/dvb/dvb-usb/dibusb-mc.c index 1cbc41cb4e8f..c1d9094b61e5 100644 --- a/drivers/media/dvb/dvb-usb/dibusb-mc.c +++ b/drivers/media/dvb/dvb-usb/dibusb-mc.c | |||
| @@ -83,8 +83,8 @@ static struct dvb_usb_device_properties dibusb_mc_properties = { | |||
| 83 | 83 | ||
| 84 | .rc.legacy = { | 84 | .rc.legacy = { |
| 85 | .rc_interval = DEFAULT_RC_INTERVAL, | 85 | .rc_interval = DEFAULT_RC_INTERVAL, |
| 86 | .rc_key_map = ir_codes_dibusb_table, | 86 | .rc_map_table = rc_map_dibusb_table, |
| 87 | .rc_key_map_size = 111, /* FIXME */ | 87 | .rc_map_size = 111, /* FIXME */ |
| 88 | .rc_query = dibusb_rc_query, | 88 | .rc_query = dibusb_rc_query, |
| 89 | }, | 89 | }, |
| 90 | 90 | ||