diff options
| author | Guochun Huang <hero.huang@rock-chips.com> | 2019-04-12 11:18:40 +0800 |
|---|---|---|
| committer | Guochun Huang <hero.huang@rock-chips.com> | 2019-04-12 11:18:40 +0800 |
| commit | 5b99639235f57149cbbbbbd629c3af58c994e139 (patch) | |
| tree | dfb11d09c9de986358d8de11d390126100e05d80 /drivers/video/drm/rockchip_display.h | |
| parent | 314d43c94ff2a64cf69871e776754c63a9a5743a (diff) | |
| parent | 0436a29d64ac791fefc764fadc7e64ba16bb6b25 (diff) | |
Merge remote-tracking branch 'remotes/rk3399/next-dev' into rk3399-pie-gms-express-baseline
Diffstat (limited to 'drivers/video/drm/rockchip_display.h')
| -rw-r--r-- | drivers/video/drm/rockchip_display.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/drm/rockchip_display.h b/drivers/video/drm/rockchip_display.h index 1c72aa966f..cc719b8aac 100644 --- a/drivers/video/drm/rockchip_display.h +++ b/drivers/video/drm/rockchip_display.h @@ -129,7 +129,7 @@ struct logo_info { bool ymirror; u32 offset; u32 width; - u32 height; + int height; u32 bpp; }; |