Commit 12a5088e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ata-6.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata 

Pull ata fix from Damien Le Moal:

 - Add missing MODULE_DESCRIPTION() in the many of the protocol modules
   for the pata_parport driver to avoid compilation warnings with "make
   W=1".

* tag 'ata-6.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
  ata: pata_parport: Add missing protocol modules description
parents 57f1f9dd cec148c2

drivers/ata/pata_parport/aten.c

+2 −0
Original line number Diff line number Diff line
@@ -139,4 +139,6 @@ static struct pi_protocol aten = { 
};



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Grant R. Guenther <grant@torque.net>");

MODULE_DESCRIPTION("ATEN EH-100 parallel port IDE adapter protocol driver");

module_pata_parport_driver(aten);

drivers/ata/pata_parport/bpck.c

+2 −0
Original line number Diff line number Diff line
@@ -502,4 +502,6 @@ static struct pi_protocol bpck = { 
};



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Grant R. Guenther <grant@torque.net>");

MODULE_DESCRIPTION("MicroSolutions BACKPACK parallel port IDE adapter protocol driver");

module_pata_parport_driver(bpck);

drivers/ata/pata_parport/bpck6.c

+2 −1
Original line number Diff line number Diff line
@@ -459,5 +459,6 @@ static struct pi_protocol bpck6 = { 


MODULE_LICENSE("GPL");

MODULE_AUTHOR("Micro Solutions Inc.");

MODULE_DESCRIPTION("BACKPACK Protocol module, compatible with PARIDE");

MODULE_DESCRIPTION("Micro Solutions BACKPACK parallel port IDE adapter "

		   "(version 6 drives) protocol driver");

module_pata_parport_driver(bpck6);

drivers/ata/pata_parport/comm.c

+2 −0
Original line number Diff line number Diff line
@@ -201,4 +201,6 @@ static struct pi_protocol comm = { 
};



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Grant R. Guenther <grant@torque.net>");

MODULE_DESCRIPTION("DataStor Commuter parallel port IDE adapter protocol driver");

module_pata_parport_driver(comm);

drivers/ata/pata_parport/dstr.c

+2 −0
Original line number Diff line number Diff line
@@ -230,4 +230,6 @@ static struct pi_protocol dstr = { 
};



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Grant R. Guenther <grant@torque.net>");

MODULE_DESCRIPTION("DataStor EP2000 parallel port IDE adapter protocol driver");

module_pata_parport_driver(dstr);