diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-05-24 10:13:01 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-05-24 10:13:01 +0200 |
| commit | e644dae645e167d154c0526358940986682a72b0 (patch) | |
| tree | 972993c6568085b8d407fc7e13de10f4b93c651d /drivers/input/gameport/emu10k1-gp.c | |
| parent | Input: synaptics - fix regression with "image sensor" trackpads (diff) | |
| parent | Input: matrix-keymap - fix building keymaps (diff) | |
| download | linux-e644dae645e167d154c0526358940986682a72b0.tar.xz linux-e644dae645e167d154c0526358940986682a72b0.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/gameport/emu10k1-gp.c')
| -rw-r--r-- | drivers/input/gameport/emu10k1-gp.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/input/gameport/emu10k1-gp.c b/drivers/input/gameport/emu10k1-gp.c index 422aa0a6b77f..daceafe7ee7d 100644 --- a/drivers/input/gameport/emu10k1-gp.c +++ b/drivers/input/gameport/emu10k1-gp.c @@ -125,15 +125,4 @@ static struct pci_driver emu_driver = { .remove = __devexit_p(emu_remove), }; -static int __init emu_init(void) -{ - return pci_register_driver(&emu_driver); -} - -static void __exit emu_exit(void) -{ - pci_unregister_driver(&emu_driver); -} - -module_init(emu_init); -module_exit(emu_exit); +module_pci_driver(emu_driver); |