linuxmsm/laptops-kernel
0
0
Fork 0
mirror of https://github.com/linux-msm/laptops-kernel.git synced 2026-08-13 14:19:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'fbdev-for-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev

Browse Source 
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
  ...
This commit is contained in:
Linus Torvalds
2024-07-18 11:47:14 -07:00
parent 24777bac4a 8b5ea9029b
commit cb273eb7c8
41 changed files with 78 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/char/agp/ali-agp.c
+1
View File
@@ -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
View File
@@ -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
View File
@@ -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
View File
@@ -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
View File
@@ -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");
drivers/char/agp/nvidia-agp.c
+1
View File
@@ -462,6 +462,7 @@ static void __exit agp_nvidia_cleanup(void)
module_init(agp_nvidia_init);
module_exit(agp_nvidia_cleanup);
MODULE_DESCRIPTION("Nvidia AGPGART routines");
MODULE_LICENSE("GPL and additional rights");
MODULE_AUTHOR("NVIDIA Corporation");
drivers/char/agp/parisc-agp.c
+1
View File
@@ -432,4 +432,5 @@ out:
module_init(parisc_agp_init);
MODULE_AUTHOR("Kyle McMartin <kyle@parisc-linux.org>");
MODULE_DESCRIPTION("HP Quicksilver AGP GART routines");
MODULE_LICENSE("GPL");
drivers/char/agp/sworks-agp.c
+1
View File
@@ -564,5 +564,6 @@ static void __exit agp_serverworks_cleanup(void)
module_init(agp_serverworks_init);
module_exit(agp_serverworks_cleanup);
MODULE_DESCRIPTION("Serverworks AGPGART routines");
MODULE_LICENSE("GPL and additional rights");
drivers/video/console/mdacon.c
+1
View File
@@ -561,5 +561,6 @@ static void __exit mda_console_exit(void)
module_init(mda_console_init);
module_exit(mda_console_exit);
MODULE_DESCRIPTION("MDA based console driver");
MODULE_LICENSE("GPL");
drivers/video/console/newport_con.c
+1
View File
@@ -744,4 +744,5 @@ static struct gio_driver newport_driver = {
};
module_driver(newport_driver, gio_register_driver, gio_unregister_driver);
MODULE_DESCRIPTION("SGI Newport console driver");
MODULE_LICENSE("GPL");
drivers/video/console/sticon.c
+1
View File
@@ -391,4 +391,5 @@ static int __init sticonsole_init(void)
}
module_init(sticonsole_init);
MODULE_DESCRIPTION("HP STI console driver");
MODULE_LICENSE("GPL");
drivers/video/console/vgacon.c
+1
View File
@@ -1222,4 +1222,5 @@ void vgacon_register_screen(struct screen_info *si)
vga_si = si;
}
MODULE_DESCRIPTION("VGA based console driver");
MODULE_LICENSE("GPL");
drivers/video/fbdev/amifb.c
+1
View File
@@ -3782,5 +3782,6 @@ static struct platform_driver amifb_driver __refdata = {
module_platform_driver_probe(amifb_driver, amifb_probe);
MODULE_DESCRIPTION("Amiga builtin chipset frame buffer driver");
MODULE_LICENSE("GPL");
MODULE_ALIAS("platform:amiga-video");
drivers/video/fbdev/c2p_planar.c
+1
View File
@@ -153,4 +153,5 @@ void c2p_planar(void *dst, const void *src, u32 dx, u32 dy, u32 width,
}
EXPORT_SYMBOL_GPL(c2p_planar);
MODULE_DESCRIPTION("Fast C2P (Chunky-to-Planar) Conversion");
MODULE_LICENSE("GPL");
drivers/video/fbdev/goldfishfb.c
+1
View File
@@ -321,4 +321,5 @@ static struct platform_driver goldfish_fb_driver = {
module_platform_driver(goldfish_fb_driver);
MODULE_DESCRIPTION("Goldfish Virtual Platform Framebuffer driver");
MODULE_LICENSE("GPL v2");
drivers/video/fbdev/kyro/fbdev.c
+1
View File
@@ -811,4 +811,5 @@ module_exit(kyrofb_exit);
#endif
MODULE_AUTHOR("STMicroelectronics; Paul Mundt <lethal@linux-sh.org>");
MODULE_DESCRIPTION("STG4000/Kyro/PowerVR 3 driver");
MODULE_LICENSE("GPL");
drivers/video/fbdev/macmodes.c
+1
View File
@@ -411,4 +411,5 @@ int mac_find_mode(struct fb_var_screeninfo *var, struct fb_info *info,
}
EXPORT_SYMBOL(mac_find_mode);
MODULE_DESCRIPTION("MacOS video mode library");
MODULE_LICENSE("GPL");
drivers/video/fbdev/matrox/matroxfb_DAC1064.c
+1
View File
@@ -1111,4 +1111,5 @@ EXPORT_SYMBOL(matrox_G100);
EXPORT_SYMBOL(DAC1064_global_init);
EXPORT_SYMBOL(DAC1064_global_restore);
#endif
MODULE_DESCRIPTION("Matrox Mystique/G100 output driver");
MODULE_LICENSE("GPL");
drivers/video/fbdev/matrox/matroxfb_Ti3026.c
+1
View File
@@ -746,4 +746,5 @@ struct matrox_switch matrox_millennium = {
};
EXPORT_SYMBOL(matrox_millennium);
#endif
MODULE_DESCRIPTION("Matrox Millennium output driver");
MODULE_LICENSE("GPL");
drivers/video/fbdev/matrox/matroxfb_accel.c
+1
View File
@@ -517,4 +517,5 @@ static void matroxfb_imageblit(struct fb_info* info, const struct fb_image* imag
}
}
MODULE_DESCRIPTION("Accelerated fbops for Matrox Millennium/Mystique/G100/G200/G400/G450/G550");
MODULE_LICENSE("GPL");

Some files were not shown because too many files have changed in this diff Show More