diff options
| author | Jiri Kosina | 2017-11-15 11:10:38 +0100 |
|---|---|---|
| committer | Jiri Kosina | 2017-11-15 11:10:38 +0100 |
| commit | 6ed7a70be54ef6148cbfce0d59d12d2aa41bbb23 (patch) | |
| tree | 718281e0f03caaf45c3928fab322e60f7631a9bb /drivers/hid/hid-core.c | |
| parent | Merge branch 'for-4.15/sony' into for-linus (diff) | |
| parent | HID: cp2112: fix broken gpio_direction_input callback (diff) | |
| download | kernel-qcow2-linux-6ed7a70be54ef6148cbfce0d59d12d2aa41bbb23.tar.gz kernel-qcow2-linux-6ed7a70be54ef6148cbfce0d59d12d2aa41bbb23.tar.xz kernel-qcow2-linux-6ed7a70be54ef6148cbfce0d59d12d2aa41bbb23.zip | |
Merge branch 'for-4.15/upstream' into for-linus
- cp2112: GPIO error handling and Kconfig fixes from Sébastien Szymanski
- i2c-hid: fixup / quirk for Apollo-Lake based laptops, from Hans de Goede
- Input/Core: add eraser tool support, from Ping Cheng
- small assorted code fixes
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-core.c')
| -rw-r--r-- | drivers/hid/hid-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index d3f983a4245a..f3fcb836a1f9 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1662,7 +1662,7 @@ static struct bin_attribute dev_bin_attr_report_desc = { .size = HID_MAX_DESCRIPTOR_SIZE, }; -static struct device_attribute dev_attr_country = { +static const struct device_attribute dev_attr_country = { .attr = { .name = "country", .mode = 0444 }, .show = show_country, }; |