Skip to content

Commit cb273eb

Browse files
torvaldstorvalds
committed
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 ...
2 parents 24777ba + 8b5ea90 commit cb273eb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+78
-64
lines changed

‎drivers/char/agp/ali-agp.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,5 +418,6 @@ module_init(agp_ali_init);
418418
module_exit(agp_ali_cleanup);
419419

420420
MODULE_AUTHOR("Dave Jones");
421+
MODULE_DESCRIPTION("ALi AGPGART routines");
421422
MODULE_LICENSE("GPL and additional rights");
422423

‎drivers/char/agp/alpha-agp.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,4 +217,5 @@ module_init(agp_alpha_core_init);
217217
module_exit(agp_alpha_core_cleanup);
218218

219219
MODULE_AUTHOR("Jeff Wiedemeier <[email protected]>");
220+
MODULE_DESCRIPTION("Alpha AGP support");
220221
MODULE_LICENSE("GPL and additional rights");

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -549,4 +549,5 @@ static void __exit agp_amdk7_cleanup(void)
549549
module_init(agp_amdk7_init);
550550
module_exit(agp_amdk7_cleanup);
551551

552+
MODULE_DESCRIPTION("AMD K7 AGPGART routines");
552553
MODULE_LICENSE("GPL and additional rights");

‎drivers/char/agp/ati-agp.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,5 +572,6 @@ module_init(agp_ati_init);
572572
module_exit(agp_ati_cleanup);
573573

574574
MODULE_AUTHOR("Dave Jones");
575+
MODULE_DESCRIPTION("ATi AGPGART routines");
575576
MODULE_LICENSE("GPL and additional rights");
576577

‎drivers/char/agp/efficeon-agp.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,4 +465,5 @@ module_init(agp_efficeon_init);
465465
module_exit(agp_efficeon_cleanup);
466466

467467
MODULE_AUTHOR("Carlos Puchol <[email protected]>");
468+
MODULE_DESCRIPTION("Transmeta's Efficeon AGPGART driver");
468469
MODULE_LICENSE("GPL and additional rights");

‎drivers/char/agp/nvidia-agp.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,7 @@ static void __exit agp_nvidia_cleanup(void)
462462
module_init(agp_nvidia_init);
463463
module_exit(agp_nvidia_cleanup);
464464

465+
MODULE_DESCRIPTION("Nvidia AGPGART routines");
465466
MODULE_LICENSE("GPL and additional rights");
466467
MODULE_AUTHOR("NVIDIA Corporation");
467468

‎drivers/char/agp/parisc-agp.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,4 +432,5 @@ parisc_agp_init(void)
432432
module_init(parisc_agp_init);
433433

434434
MODULE_AUTHOR("Kyle McMartin <[email protected]>");
435+
MODULE_DESCRIPTION("HP Quicksilver AGP GART routines");
435436
MODULE_LICENSE("GPL");

‎drivers/char/agp/sworks-agp.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -564,5 +564,6 @@ static void __exit agp_serverworks_cleanup(void)
564564
module_init(agp_serverworks_init);
565565
module_exit(agp_serverworks_cleanup);
566566

567+
MODULE_DESCRIPTION("Serverworks AGPGART routines");
567568
MODULE_LICENSE("GPL and additional rights");
568569

‎drivers/video/console/mdacon.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -561,5 +561,6 @@ static void __exit mda_console_exit(void)
561561
module_init(mda_console_init);
562562
module_exit(mda_console_exit);
563563

564+
MODULE_DESCRIPTION("MDA based console driver");
564565
MODULE_LICENSE("GPL");
565566

‎drivers/video/console/newport_con.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -744,4 +744,5 @@ static struct gio_driver newport_driver = {
744744
};
745745
module_driver(newport_driver, gio_register_driver, gio_unregister_driver);
746746

747+
MODULE_DESCRIPTION("SGI Newport console driver");
747748
MODULE_LICENSE("GPL");

0 commit comments

Comments
 (0)