summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-08-25 11:43:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-08-25 11:43:17 -0700
commitc749088f254303c57cb3eaed2b29beaae145cef3 (patch)
treef1cdf4ac9c0361661f2a9221665e3bc5a9271d47
parent32ae83ffec6373c226d177bdbbbb156962cc638e (diff)
parenta180d023ec7ba0e43b2385876950d9ce7ab618f1 (diff)
downloadlinux-c749088f254303c57cb3eaed2b29beaae145cef3.tar.gz
linux-c749088f254303c57cb3eaed2b29beaae145cef3.tar.bz2
linux-c749088f254303c57cb3eaed2b29beaae145cef3.zip
Merge tag 'auxdisplay-for-linus-v5.3-rc7' of git://github.com/ojeda/linux
Pull auxdisplay cleanup from Miguel Ojeda: "Make ht16k33_fb_fix and ht16k33_fb_var constant (Nishka Dasgupta)" * tag 'auxdisplay-for-linus-v5.3-rc7' of git://github.com/ojeda/linux: auxdisplay: ht16k33: Make ht16k33_fb_fix and ht16k33_fb_var constant
-rw-r--r--drivers/auxdisplay/ht16k33.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/auxdisplay/ht16k33.c b/drivers/auxdisplay/ht16k33.c
index 9c0bb771751d..a2fcde582e2a 100644
--- a/drivers/auxdisplay/ht16k33.c
+++ b/drivers/auxdisplay/ht16k33.c
@@ -74,7 +74,7 @@ struct ht16k33_priv {
struct ht16k33_fbdev fbdev;
};
-static struct fb_fix_screeninfo ht16k33_fb_fix = {
+static const struct fb_fix_screeninfo ht16k33_fb_fix = {
.id = DRIVER_NAME,
.type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_MONO10,
@@ -85,7 +85,7 @@ static struct fb_fix_screeninfo ht16k33_fb_fix = {
.accel = FB_ACCEL_NONE,
};
-static struct fb_var_screeninfo ht16k33_fb_var = {
+static const struct fb_var_screeninfo ht16k33_fb_var = {
.xres = HT16K33_MATRIX_LED_MAX_ROWS,
.yres = HT16K33_MATRIX_LED_MAX_COLS,
.xres_virtual = HT16K33_MATRIX_LED_MAX_ROWS,