Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux...

[~andy/linux] / drivers / net / can / sja1000 / peak_pcmcia.c

diff --git a/drivers/net/can/sja1000/peak_pcmcia.c b/drivers/net/can/sja1000/peak_pcmcia.c
index 977901a0214abc2cb9029407dc693ec92fc1d783..f7ad754dd2aa1427380b79eabf6c661d6114ba48 100644 (file)
--- a/drivers/net/can/sja1000/peak_pcmcia.c
+++ b/drivers/net/can/sja1000/peak_pcmcia.c
@@ -740,15 +740,4 @@ static struct pcmcia_driver pcan_driver = {
        .remove = pcan_remove,
        .id_table = pcan_table,
 };
-
-static int __init pcan_init(void)
-{
-       return pcmcia_register_driver(&pcan_driver);
-}
-module_init(pcan_init);
-
-static void __exit pcan_exit(void)
-{
-       pcmcia_unregister_driver(&pcan_driver);
-}
-module_exit(pcan_exit);
+module_pcmcia_driver(pcan_driver);