diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-11 16:45:41 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-11 16:45:43 +1100 |
| commit | 2bcae7925413156780f0bc00b3a3b20a0e09c948 (patch) | |
| tree | 71c6f9d388e95490096c2e24fb7b5331cc947912 /drivers/net/irda/donauboe.c | |
| parent | 80d50b9fca54d3014895f492f2cf291251d41f6d (diff) | |
| parent | 7c5598d4c8740214860372b6e6114f2675d68429 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
arch/x86/mm/init.c
fs/anon_inodes.c
fs/autofs4/inode.c
include/linux/lglock.h
kernel/Makefile
scripts/bloat-o-meter
Diffstat (limited to 'drivers/net/irda/donauboe.c')
| -rw-r--r-- | drivers/net/irda/donauboe.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c index 768dfe9a9315..6d3e2093bf7f 100644 --- a/drivers/net/irda/donauboe.c +++ b/drivers/net/irda/donauboe.c @@ -1755,17 +1755,4 @@ static struct pci_driver donauboe_pci_driver = { .resume = toshoboe_wakeup }; -static int __init -donauboe_init (void) -{ - return pci_register_driver(&donauboe_pci_driver); -} - -static void __exit -donauboe_cleanup (void) -{ - pci_unregister_driver(&donauboe_pci_driver); -} - -module_init(donauboe_init); -module_exit(donauboe_cleanup); +module_pci_driver(donauboe_pci_driver); |