Merge branches 'pm-sleep' and 'pm-domains'

[karo-tx-linux.git] / drivers / ata / pata_isapnp.c

diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c
index b33d1f99b3a44bb40e76a529a8eddbc2268bdc20..994f168b54a804184ebb01b20b8acda16230e62d 100644 (file)
--- a/drivers/ata/pata_isapnp.c
+++ b/drivers/ata/pata_isapnp.c
@@ -128,20 +128,8 @@ static struct pnp_driver isapnp_driver = {
        .remove         = isapnp_remove_one,
 };
 
-static int __init isapnp_init(void)
-{
-       return pnp_register_driver(&isapnp_driver);
-}
-
-static void __exit isapnp_exit(void)
-{
-       pnp_unregister_driver(&isapnp_driver);
-}
-
+module_pnp_driver(isapnp_driver);
 MODULE_AUTHOR("Alan Cox");
 MODULE_DESCRIPTION("low-level driver for ISA PnP ATA");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
-
-module_init(isapnp_init);
-module_exit(isapnp_exit);