diff --git a/[refs] b/[refs] index d7f751436ed1..e7b4dcf0826b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58b2c0ca0bd16ddefd1d981fe8748ca8083294c6 +refs/heads/master: 1bc7c1c71d7f84baff254868222312bf14915128 diff --git a/trunk/drivers/staging/ipack/carriers/tpci200.c b/trunk/drivers/staging/ipack/carriers/tpci200.c index 376e79410e99..829fd1ac8f8a 100644 --- a/trunk/drivers/staging/ipack/carriers/tpci200.c +++ b/trunk/drivers/staging/ipack/carriers/tpci200.c @@ -618,17 +618,7 @@ static struct pci_driver tpci200_pci_drv = { .remove = __devexit_p(tpci200_pci_remove), }; -static int __init tpci200_drvr_init_module(void) -{ - return pci_register_driver(&tpci200_pci_drv); -} - -static void __exit tpci200_drvr_exit_module(void) -{ - pci_unregister_driver(&tpci200_pci_drv); -} +module_pci_driver(tpci200_pci_drv); MODULE_DESCRIPTION("TEWS TPCI-200 device driver"); MODULE_LICENSE("GPL"); -module_init(tpci200_drvr_init_module); -module_exit(tpci200_drvr_exit_module);