Commit 71bed1ec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pcmcia-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux 

Pull PCMCIA updates from Dominik Brodowski:
 "A number of tiny cleanups of the PCMCIA subsystem by Jeff Johnson,
  Jules Irenge, and Krzysztof Kozlowski"

* tag 'pcmcia-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
  pcmcia: add missing MODULE_DESCRIPTION() macros
  pcmcia: Use resource_size function on resource object
  pcmcia: bcm63xx: drop driver owner assignment
parents fd71b9a0 0630e3bc

drivers/pcmcia/bcm63xx_pcmcia.c

+0 −1
Original line number Diff line number Diff line
@@ -456,7 +456,6 @@ struct platform_driver bcm63xx_pcmcia_driver = { 
	.remove_new = bcm63xx_drv_pcmcia_remove,

	.driver	= {

		.name	= "bcm63xx_pcmcia",

		.owner  = THIS_MODULE,

	},

};

drivers/pcmcia/i82092.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "i82092aa.h"

#include "i82365.h"



MODULE_DESCRIPTION("Driver for Intel I82092AA PCI-PCMCIA bridge");

MODULE_LICENSE("GPL");



/* PCI core routines */

drivers/pcmcia/i82365.c

+1 −0
Original line number Diff line number Diff line
@@ -1342,5 +1342,6 @@ static void __exit exit_i82365(void) 


module_init(init_i82365);

module_exit(exit_i82365);

MODULE_DESCRIPTION("Driver for Intel 82365 and compatible PC Card controllers");

MODULE_LICENSE("Dual MPL/GPL");

/*====================================================================*/

drivers/pcmcia/max1600.c

+1 −0
Original line number Diff line number Diff line
@@ -119,4 +119,5 @@ int max1600_configure(struct max1600 *m, unsigned int vcc, unsigned int vpp) 
}

EXPORT_SYMBOL_GPL(max1600_configure);



MODULE_DESCRIPTION("MAX1600 PCMCIA power switch library");

MODULE_LICENSE("GPL v2");

drivers/pcmcia/rsrc_mgr.c

+1 −0
Original line number Diff line number Diff line
@@ -66,5 +66,6 @@ EXPORT_SYMBOL(pccard_static_ops); 




MODULE_AUTHOR("David A. Hinds, Dominik Brodowski");

MODULE_DESCRIPTION("PCMCIA resource management routines");

MODULE_LICENSE("GPL");

MODULE_ALIAS("rsrc_nonstatic");