diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-06-06 20:45:37 +0300 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-06-06 20:45:37 +0300 |
commit | 8dd06ef34b6e2f41b29fbf5fc1663780f2524285 (patch) | |
tree | d59152f37ea7b36c3cf1778e20b85239f89c4e77 /drivers/video/fbdev/s3fb.c | |
parent | 642aa86eaf8f1e6fe894f20fd7f12f0db52ee03c (diff) | |
parent | d0ac7079d5fcaaaf3eb99c197a08ac1b399754f4 (diff) | |
download | linux-8dd06ef34b6e2f41b29fbf5fc1663780f2524285.tar.xz |
Merge branch 'next' into for-linus
Prepare input updates for 5.8 merge window.
Diffstat (limited to 'drivers/video/fbdev/s3fb.c')
-rw-r--r-- | drivers/video/fbdev/s3fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/s3fb.c b/drivers/video/fbdev/s3fb.c index be16c349c10f..60c424fae988 100644 --- a/drivers/video/fbdev/s3fb.c +++ b/drivers/video/fbdev/s3fb.c @@ -1037,7 +1037,7 @@ static int s3fb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info) /* Frame buffer operations */ -static struct fb_ops s3fb_ops = { +static const struct fb_ops s3fb_ops = { .owner = THIS_MODULE, .fb_open = s3fb_open, .fb_release = s3fb_release, |