leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'next' into for-linus

Browse Source 
Prepare input updates for 4.15 merge window.
This commit is contained in:
Dmitry Torokhov
2017-11-13 17:10:13 -08:00
parent 26dd633e43 c1b433e04e
commit c25141062a
28378 changed files with 1483141 additions and 614198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/input/rmi4/Makefile
View File

@@ -1,3 +1,4 @@
# SPDX-License-Identifier: GPL-2.0
obj-$(CONFIG_RMI4_CORE) += rmi_core.o
rmi_core-y := rmi_bus.o rmi_driver.o rmi_f01.o

2
drivers/input/rmi4/rmi_f54.c
View File

@@ -73,7 +73,7 @@ enum rmi_f54_report_type {
F54_MAX_REPORT_TYPE,
};
const char *rmi_f54_report_type_names[] = {
static const char * const rmi_f54_report_type_names[] = {
[F54_REPORT_NONE] = "Unknown",
[F54_8BIT_IMAGE] = "Normalized 8-Bit Image",
[F54_16BIT_IMAGE] = "Normalized 16-Bit Image",