diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-18 11:47:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-18 11:47:14 -0700 |
| commit | cb273eb7c8390c70a484db6c79a797e377db09b5 (patch) | |
| tree | 4f7ea8f21c446a880dbad90c0b76ce573e85ee77 /include/linux/linux_logo.h | |
| parent | 24777bac4af5fcddb0cf4a7d8a2b6ee2a98fe6fd (diff) | |
| parent | 8b5ea9029b03efda74292c57e0377a98ed0b7434 (diff) | |
| download | linux-cb273eb7c8390c70a484db6c79a797e377db09b5.tar.gz linux-cb273eb7c8390c70a484db6c79a797e377db09b5.tar.bz2 linux-cb273eb7c8390c70a484db6c79a797e377db09b5.zip | |
Merge tag 'fbdev-for-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev
Pull fbdev updates from Helge Deller:
- Detect VGA compatibility from VESA attributes (Thomas Zimmermann)
- Make I2C terminology more inclusive in smscufx and viafb (Easwar
Hariharan)
- Add lots of missing MODULE_DESCRIPTION() macros (Jeff Johnson)
- Logo code cleanups (Geert Uytterhoeven)
- Minor fixes by Chen Ni, Kuninori Morimoto, Uwe Kleine-König and
Christophe Jaillett
* tag 'fbdev-for-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev: (21 commits)
fbdev: viafb: Make I2C terminology more inclusive
fbdev: smscufx: Make I2C terminology more inclusive
fbdev: omap2: Return clk_prepare_enable to transfer the error
fbdev: mmp: Constify struct mmp_overlay_ops
fbdev: Drop explicit initialization of struct i2c_device_id::driver_data to 0
video: agp: add remaining missing MODULE_DESCRIPTION() macros
video: console: add missing MODULE_DESCRIPTION() macros
fbdev: amifb: add missing MODULE_DESCRIPTION() macro
fbdev: c2p_planar: add missing MODULE_DESCRIPTION() macro
fbdev: vesafb: Detect VGA compatibility from screen info's VESA attributes
fbdev: omapfb: use of_graph_get_remote_port()
fbdev: omapdss: use for_each_endpoint_of_node()
fbdev: offb: add missing MODULE_DESCRIPTION() macro
fbdev: vfb: add missing MODULE_DESCRIPTION() macro
fbdev: macmodes: add missing MODULE_DESCRIPTION() macro
fbdev: goldfishfb: add missing MODULE_DESCRIPTION() macro
fbdev: kyro: add missing MODULE_DESCRIPTION() macro
fbdev: viafb: add missing MODULE_DESCRIPTION() macro
fbdev: matroxfb: add missing MODULE_DESCRIPTION() macros
video/logo: Remove linux_serial_image comments
...
Diffstat (limited to 'include/linux/linux_logo.h')
| -rw-r--r-- | include/linux/linux_logo.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/linux_logo.h b/include/linux/linux_logo.h index d4d5b93efe84..e37699b7e839 100644 --- a/include/linux/linux_logo.h +++ b/include/linux/linux_logo.h @@ -10,9 +10,6 @@ * Copyright (C) 2001 Greg Banks <gnb@alphalink.com.au> * Copyright (C) 2001 Jan-Benedict Glaw <jbglaw@lug-owl.de> * Copyright (C) 2003 Geert Uytterhoeven <geert@linux-m68k.org> - * - * Serial_console ascii image can be any size, - * but should contain %s to display the version */ #include <linux/init.h> |