diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-27 21:19:51 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-27 21:19:51 +0300 |
| commit | 725a345b2ee3c24f9ac2078eb73667e22a1b7214 (patch) | |
| tree | f8ed5ffbbc1abdcd372dce908379fba92c29b9be /include | |
| parent | 89555eebb9fb603ad43c0def8ab35e76c210002f (diff) | |
| parent | 60ed3cd85b95184936bce70ed7f9e76a6a54a5e1 (diff) | |
| download | linux-725a345b2ee3c24f9ac2078eb73667e22a1b7214.tar.xz | |
Merge tag 'fbdev-for-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev
Pull fbdev updates from Helge Deller:
"Nothing really exiting in here.
The majority of lines changed is due to Uwe's preparation patches to
change the return value of the .remove() callback to void.
Summary:
- vt_buffer.h: Fix build on alpha (Randy Dunlap)
- mmp: Clock handling fix (Christophe JAILLET)
- 68328fb, ps3fb, vfb: Init .owner field of struct fb_ops (Thomas
Zimmermann)
- fbdev: cg14: Convert to platform remove callback returning void
- Preparation patches to convert drivers to return void in .remove()
callback (Uwe Kleine-König)
- Drop Paul Mackerras as rage128 maintainer"
* tag 'fbdev-for-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev: (51 commits)
MAINTAINERS: Remove rage128 framebuffer driver maintainer
fbdev: vfb: Init owner field of struct fb_ops
fbdev: ps3fb: Init owner field of struct fb_ops
fbdev: 68328fb: Init owner field of struct fb_ops
fbdev: mmp: Fix deferred clk handling in mmphw_probe()
linux/vt_buffer.h: allow either builtin or modular for macros
fbdev: xilinxfb: Convert to platform remove callback returning void
fbdev: wmt_ge_rops: Convert to platform remove callback returning void
fbdev: wm8505fb: Convert to platform remove callback returning void
fbdev: vt8500lcdfb: Convert to platform remove callback returning void
fbdev: via: Convert to platform remove callback returning void
fbdev: vga16fb: Convert to platform remove callback returning void
fbdev: vfb: Convert to platform remove callback returning void
fbdev: vesafb: Convert to platform remove callback returning void
fbdev: uvesafb: Convert to platform remove callback returning void
fbdev: tcx: Convert to platform remove callback returning void
fbdev: sm501fb: Convert to platform remove callback returning void
fbdev: simplefb: Convert to platform remove callback returning void
fbdev: sh_mobile_lcdcfb: Convert to platform remove callback returning void
fbdev: sh7760fb: Convert to platform remove callback returning void
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/vt_buffer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/vt_buffer.h b/include/linux/vt_buffer.h index 848db1b1569f..919d999a8c1d 100644 --- a/include/linux/vt_buffer.h +++ b/include/linux/vt_buffer.h @@ -16,7 +16,7 @@ #include <linux/string.h> -#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_MDA_CONSOLE) +#if IS_ENABLED(CONFIG_VGA_CONSOLE) || IS_ENABLED(CONFIG_MDA_CONSOLE) #include <asm/vga.h> #endif |