diff options
author | Jani Nikula <jani.nikula@intel.com> | 2020-01-09 17:19:12 +0200 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2020-01-09 17:19:12 +0200 |
commit | ec027b33c8bb164430224ce1f5cb733036b20d3f (patch) | |
tree | 1f12e08a45ebed8c6fc34948b54f53da621c8976 /drivers/video/fbdev/pm3fb.c | |
parent | 6251215fe56c39e07de8bcb3a5ecb19a80ef423e (diff) | |
parent | a566696cf9f27f701cd4a6426d46f112c180059c (diff) |
Merge drm/drm-next into drm-intel-next-queued
Sync with drm-next to get the new logging macros, among other things.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/video/fbdev/pm3fb.c')
-rw-r--r-- | drivers/video/fbdev/pm3fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/pm3fb.c b/drivers/video/fbdev/pm3fb.c index 6130aa56a1e9..15a2b495235b 100644 --- a/drivers/video/fbdev/pm3fb.c +++ b/drivers/video/fbdev/pm3fb.c @@ -1200,7 +1200,7 @@ static int pm3fb_blank(int blank_mode, struct fb_info *info) * Frame buffer operations */ -static struct fb_ops pm3fb_ops = { +static const struct fb_ops pm3fb_ops = { .owner = THIS_MODULE, .fb_check_var = pm3fb_check_var, .fb_set_par = pm3fb_set_par, |