Commit 4eaa39c6 authored Feb 08, 2017 by Dave Airlie

Merge branch 'drm-rockchip-next-2017-02-07' of...

Merge branch 'drm-rockchip-next-2017-02-07' of https://github.com/markyzq/kernel-drm-rockchip into drm-next

Single compile fix.

* 'drm-rockchip-next-2017-02-07' of https://github.com/markyzq/kernel-drm-rockchip:
  drm/rockchip: cdn-dp: fix cdn-dp complie warning

parents 26d7f34c 213c4b96

drivers/gpu/drm/rockchip/cdn-dp-reg.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -592,7 +592,7 @@ static int cdn_dp_get_msa_misc(struct video_info *video,
		struct drm_display_mode *mode)
		{
		u32 msa_misc;
		u8 val[2];
		u8 val[2] = {0};

		switch (video->color_fmt) {
		case PXL_RGB:

Admin message