diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-12-16 08:36:09 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-12-16 08:36:09 +0300 |
| commit | ebfb0184ef560897fad35005989e82433419202c (patch) | |
| tree | 226a8195fdae6c79d90d76baa1cbdaf80f794bb0 /drivers/media/usb/hdpvr/hdpvr-i2c.c | |
| parent | f43d3ec3a889c7f6a196f3b6d6b13345ee46af8a (diff) | |
| parent | 5191d88acc688743eef56f1c598a4e4cddf6c6cd (diff) | |
| download | linux-ebfb0184ef560897fad35005989e82433419202c.tar.xz | |
Merge branch 'synaptics-rmi4' into next
Merge updated Synaptics RMI4 support, including support for SMBus
controllers and flashing firmware.
Diffstat (limited to 'drivers/media/usb/hdpvr/hdpvr-i2c.c')
| -rw-r--r-- | drivers/media/usb/hdpvr/hdpvr-i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/hdpvr/hdpvr-i2c.c b/drivers/media/usb/hdpvr/hdpvr-i2c.c index a38f58c4c6bf..9b641c4d4431 100644 --- a/drivers/media/usb/hdpvr/hdpvr-i2c.c +++ b/drivers/media/usb/hdpvr/hdpvr-i2c.c @@ -55,7 +55,7 @@ struct i2c_client *hdpvr_register_ir_rx_i2c(struct hdpvr_device *dev) /* Our default information for ir-kbd-i2c.c to use */ init_data->ir_codes = RC_MAP_HAUPPAUGE; init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR; - init_data->type = RC_BIT_RC5; + init_data->type = RC_BIT_RC5 | RC_BIT_RC6_MCE | RC_BIT_RC6_6A_32; init_data->name = "HD-PVR"; init_data->polling_interval = 405; /* ms, duplicated from Windows */ hdpvr_ir_rx_i2c_board_info.platform_data = init_data; @@ -180,7 +180,7 @@ static u32 hdpvr_functionality(struct i2c_adapter *adapter) return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; } -static struct i2c_algorithm hdpvr_algo = { +static const struct i2c_algorithm hdpvr_algo = { .master_xfer = hdpvr_transfer, .functionality = hdpvr_functionality, }; |