Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7335baed authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next

parents 2809a208 fb7944b3

drivers/net/can/pch_can.c

+1 −11
Original line number Diff line number Diff line
@@ -1274,17 +1274,7 @@ static struct pci_driver pch_can_pci_driver = { 
	.resume = pch_can_resume,

};



static int __init pch_can_pci_init(void)

{

	return pci_register_driver(&pch_can_pci_driver);

}

module_init(pch_can_pci_init);



static void __exit pch_can_pci_exit(void)

{

	pci_unregister_driver(&pch_can_pci_driver);

}

module_exit(pch_can_pci_exit);

module_pci_driver(pch_can_pci_driver);



MODULE_DESCRIPTION("Intel EG20T PCH CAN(Controller Area Network) Driver");

MODULE_LICENSE("GPL v2");

drivers/net/can/sja1000/ems_pci.c

+1 −13
Original line number Diff line number Diff line
@@ -371,16 +371,4 @@ static struct pci_driver ems_pci_driver = { 
	.remove = ems_pci_del_card,

};



static int __init ems_pci_init(void)

{

	return pci_register_driver(&ems_pci_driver);

}



static void __exit ems_pci_exit(void)

{

	pci_unregister_driver(&ems_pci_driver);

}



module_init(ems_pci_init);

module_exit(ems_pci_exit);

module_pci_driver(ems_pci_driver);

drivers/net/can/sja1000/kvaser_pci.c

+1 −12
Original line number Diff line number Diff line
@@ -397,15 +397,4 @@ static struct pci_driver kvaser_pci_driver = { 
	.remove = __devexit_p(kvaser_pci_remove_one),

};



static int __init kvaser_pci_init(void)

{

	return pci_register_driver(&kvaser_pci_driver);

}



static void __exit kvaser_pci_exit(void)

{

	pci_unregister_driver(&kvaser_pci_driver);

}



module_init(kvaser_pci_init);

module_exit(kvaser_pci_exit);
 
module_pci_driver(kvaser_pci_driver);

drivers/net/can/sja1000/peak_pci.c

+1 −11
Original line number Diff line number Diff line
@@ -749,14 +749,4 @@ static struct pci_driver peak_pci_driver = { 
	.remove = __devexit_p(peak_pci_remove),

};



static int __init peak_pci_init(void)

{

	return pci_register_driver(&peak_pci_driver);

}

module_init(peak_pci_init);



static void __exit peak_pci_exit(void)

{

	pci_unregister_driver(&peak_pci_driver);

}

module_exit(peak_pci_exit);
 
module_pci_driver(peak_pci_driver);

drivers/net/can/sja1000/plx_pci.c

+1 −12
Original line number Diff line number Diff line
@@ -609,15 +609,4 @@ static struct pci_driver plx_pci_driver = { 
	.remove = plx_pci_del_card,

};



static int __init plx_pci_init(void)

{

	return pci_register_driver(&plx_pci_driver);

}



static void __exit plx_pci_exit(void)

{

	pci_unregister_driver(&plx_pci_driver);

}



module_init(plx_pci_init);

module_exit(plx_pci_exit);
 
module_pci_driver(plx_pci_driver);