diff options
author | 2023-06-19 11:26:07 +1000 | |
---|---|---|
committer | 2023-06-19 11:28:20 +1000 | |
commit | 4e237d84eec8783eb6dfbccb04a4e570b27a9b09 (patch) | |
tree | 403f15fde15d644fcb7a7d941999c67e66ccdaa9 | |
parent | Merge tag 'mediatek-drm-next-6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-next (diff) | |
parent | fbdev: Use /* */ comment in initializer macro (diff) | |
download | wireguard-linux-4e237d84eec8783eb6dfbccb04a4e570b27a9b09.tar.xz wireguard-linux-4e237d84eec8783eb6dfbccb04a4e570b27a9b09.zip |
Merge tag 'drm-misc-next-fixes-2023-06-15' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
Short summary of fixes pull:
* Fix fbdev initializer macros
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230615114009.GA27261@linux-uq9g
-rw-r--r-- | include/linux/fb.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index ce6823e157e6..ce7d588edc3e 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -552,7 +552,7 @@ extern ssize_t fb_io_write(struct fb_info *info, const char __user *buf, .fb_imageblit = cfb_imageblit #define __FB_DEFAULT_IO_OPS_MMAP \ - .fb_mmap = NULL // default implementation + .fb_mmap = NULL /* default implementation */ #define FB_DEFAULT_IO_OPS \ __FB_DEFAULT_IO_OPS_RDWR, \ @@ -585,7 +585,7 @@ extern ssize_t fb_sys_write(struct fb_info *info, const char __user *buf, .fb_imageblit = sys_imageblit #define __FB_DEFAULT_SYS_OPS_MMAP \ - .fb_mmap = NULL // default implementation + .fb_mmap = NULL /* default implementation */ #define FB_DEFAULT_SYS_OPS \ __FB_DEFAULT_SYS_OPS_RDWR, \ |