Commit cb273eb7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents 24777bac 8b5ea902

drivers/char/agp/ali-agp.c

+1 −0
Original line number Diff line number Diff line
@@ -418,5 +418,6 @@ module_init(agp_ali_init); 
module_exit(agp_ali_cleanup);



MODULE_AUTHOR("Dave Jones");

MODULE_DESCRIPTION("ALi AGPGART routines");

MODULE_LICENSE("GPL and additional rights");

drivers/char/agp/alpha-agp.c

+1 −0
Original line number Diff line number Diff line
@@ -217,4 +217,5 @@ module_init(agp_alpha_core_init); 
module_exit(agp_alpha_core_cleanup);



MODULE_AUTHOR("Jeff Wiedemeier <Jeff.Wiedemeier@hp.com>");

MODULE_DESCRIPTION("Alpha AGP support");

MODULE_LICENSE("GPL and additional rights");

drivers/char/agp/amd-k7-agp.c

+1 −0
Original line number Diff line number Diff line
@@ -549,4 +549,5 @@ static void __exit agp_amdk7_cleanup(void) 
module_init(agp_amdk7_init);

module_exit(agp_amdk7_cleanup);



MODULE_DESCRIPTION("AMD K7 AGPGART routines");

MODULE_LICENSE("GPL and additional rights");

drivers/char/agp/ati-agp.c

+1 −0
Original line number Diff line number Diff line
@@ -572,5 +572,6 @@ module_init(agp_ati_init); 
module_exit(agp_ati_cleanup);



MODULE_AUTHOR("Dave Jones");

MODULE_DESCRIPTION("ATi AGPGART routines");

MODULE_LICENSE("GPL and additional rights");

drivers/char/agp/efficeon-agp.c

+1 −0
Original line number Diff line number Diff line
@@ -465,4 +465,5 @@ module_init(agp_efficeon_init); 
module_exit(agp_efficeon_cleanup);



MODULE_AUTHOR("Carlos Puchol <cpglinux@puchol.com>");

MODULE_DESCRIPTION("Transmeta's Efficeon AGPGART driver");

MODULE_LICENSE("GPL and additional rights");