Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337546
b: refs/heads/master
c: b61b2b1
h: refs/heads/master
v: v3
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Nov 1, 2012
1 parent 52bbc4d commit 77f6afa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 22 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6bdc31dbabc6d099859a4eb44449c3a8bd406a32
refs/heads/master: b61b2b1f588ba8b0a5eef64a78687fe5cc80d337
22 changes: 1 addition & 21 deletions trunk/drivers/staging/comedi/drivers/skel.c
Original file line number Diff line number Diff line change
Expand Up @@ -598,27 +598,7 @@ static struct pci_driver skel_pci_driver = {
.probe = &skel_pci_probe,
.remove = __devexit_p(&skel_pci_remove)
};

static int __init skel_init_module(void)
{
int retval;

retval = comedi_driver_register(&skel_driver);
if (retval < 0)
return retval;

skel_pci_driver.name = (char *)skel_driver.driver_name;
return pci_register_driver(&skel_pci_driver);
}

static void __exit skel_cleanup_module(void)
{
pci_unregister_driver(&skel_pci_driver);
comedi_driver_unregister(&skel_driver);
}

module_init(skel_init_module);
module_exit(skel_cleanup_module);
module_comedi_pci_driver(skel_driver, skel_pci_driver);
#else
module_comedi_driver(skel_driver);
#endif
Expand Down

0 comments on commit 77f6afa

Please sign in to comment.