diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-11-13 17:10:13 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-11-13 17:10:13 -0800 |
| commit | c25141062a82ae8bddced1b3ce2b57a1c0efabe0 (patch) | |
| tree | 105edf10059bc0c4f2f00338b0c861b813d1bb1a /drivers/input/rmi4 | |
| parent | Input: synaptics-rmi4 - RMI4 can also use SMBUS version 3 (diff) | |
| parent | Input: gamecon - mark expected switch fall-throughs (diff) | |
| download | linux-dev-c25141062a82ae8bddced1b3ce2b57a1c0efabe0.tar.xz linux-dev-c25141062a82ae8bddced1b3ce2b57a1c0efabe0.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 4.15 merge window.
Diffstat (limited to 'drivers/input/rmi4')
| -rw-r--r-- | drivers/input/rmi4/Makefile | 1 | ||||
| -rw-r--r-- | drivers/input/rmi4/rmi_f54.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/input/rmi4/Makefile b/drivers/input/rmi4/Makefile index 9aaac3dd8613..f17631656987 100644 --- a/drivers/input/rmi4/Makefile +++ b/drivers/input/rmi4/Makefile @@ -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 diff --git a/drivers/input/rmi4/rmi_f54.c b/drivers/input/rmi4/rmi_f54.c index f5206e2c767e..5343f2c08f15 100644 --- a/drivers/input/rmi4/rmi_f54.c +++ b/drivers/input/rmi4/rmi_f54.c @@ -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", |