diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2017-09-28 14:56:49 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2017-09-28 14:56:49 +0200 |
| commit | 32f35b863451884e856f0f577474740561a87fad (patch) | |
| tree | 2d1d55c7e2d23e27197bf84246c5f23070eb0fce /drivers/media/rc/keymaps/rc-pixelview-mk12.c | |
| parent | drm/i915: Allow optimized platform checks (diff) | |
| parent | Merge branch 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux int... (diff) | |
| download | linux-32f35b863451884e856f0f577474740561a87fad.tar.xz linux-32f35b863451884e856f0f577474740561a87fad.zip | |
Merge drm-upstream/drm-next into drm-intel-next-queued
Need MST sideband message transaction to power up/down nodes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/media/rc/keymaps/rc-pixelview-mk12.c')
| -rw-r--r-- | drivers/media/rc/keymaps/rc-pixelview-mk12.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/rc/keymaps/rc-pixelview-mk12.c b/drivers/media/rc/keymaps/rc-pixelview-mk12.c index 224d0efaa6e5..453d52d663fe 100644 --- a/drivers/media/rc/keymaps/rc-pixelview-mk12.c +++ b/drivers/media/rc/keymaps/rc-pixelview-mk12.c @@ -60,10 +60,10 @@ static struct rc_map_table pixelview_mk12[] = { static struct rc_map_list pixelview_map = { .map = { - .scan = pixelview_mk12, - .size = ARRAY_SIZE(pixelview_mk12), - .rc_type = RC_TYPE_NEC, - .name = RC_MAP_PIXELVIEW_MK12, + .scan = pixelview_mk12, + .size = ARRAY_SIZE(pixelview_mk12), + .rc_proto = RC_PROTO_NEC, + .name = RC_MAP_PIXELVIEW_MK12, } }; |