diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 13:04:13 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-11-15 13:04:13 +0300 |
| commit | 5cc619db5c34146ee821acd08382b9d78579b52e (patch) | |
| tree | ee28e3cefdb35d56e33887f05db0a50589aa5883 /drivers/media/rc/keymaps/rc-gotview7135.c | |
| parent | 83fd5ddc19931d5a5b884c43ee3c9d69c673bc96 (diff) | |
| parent | 287b8e11972f934052f4ed0751df465a5e84b69c (diff) | |
| download | linux-5cc619db5c34146ee821acd08382b9d78579b52e.tar.xz | |
Merge branch 'for-4.15/alps' into for-linus
- New ALPS touchpad (T4, found currently on HP EliteBook 1000, Zbook Stduio
and HP Elite book x360) support from Masaki Ota
Diffstat (limited to 'drivers/media/rc/keymaps/rc-gotview7135.c')
| -rw-r--r-- | drivers/media/rc/keymaps/rc-gotview7135.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/rc/keymaps/rc-gotview7135.c b/drivers/media/rc/keymaps/rc-gotview7135.c index 229a36ac7f0a..51230fbb52ba 100644 --- a/drivers/media/rc/keymaps/rc-gotview7135.c +++ b/drivers/media/rc/keymaps/rc-gotview7135.c @@ -56,10 +56,10 @@ static struct rc_map_table gotview7135[] = { static struct rc_map_list gotview7135_map = { .map = { - .scan = gotview7135, - .size = ARRAY_SIZE(gotview7135), - .rc_type = RC_TYPE_UNKNOWN, /* Legacy IR type */ - .name = RC_MAP_GOTVIEW7135, + .scan = gotview7135, + .size = ARRAY_SIZE(gotview7135), + .rc_proto = RC_PROTO_UNKNOWN, /* Legacy IR type */ + .name = RC_MAP_GOTVIEW7135, } }; |