diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-26 21:40:19 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-26 21:40:19 -0400 |
| commit | f35c69b736e4f910d7447346980145212c283570 (patch) | |
| tree | 824b90cd870e6de07bbba19d761c1c74cf1fb4a7 /drivers/parisc/superio.c | |
| parent | cd4373984a5903276f52777a6003425e023eaa7e (diff) | |
| parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) | |
Merge 3.10-rc3 into char-misc-next
We want the changes in here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/parisc/superio.c')
| -rw-r--r-- | drivers/parisc/superio.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c index ac6e8e7a02df..a042d065a0c7 100644 --- a/drivers/parisc/superio.c +++ b/drivers/parisc/superio.c | |||
| @@ -494,15 +494,4 @@ static struct pci_driver superio_driver = { | |||
| 494 | .probe = superio_probe, | 494 | .probe = superio_probe, |
| 495 | }; | 495 | }; |
| 496 | 496 | ||
| 497 | static int __init superio_modinit(void) | 497 | module_pci_driver(superio_driver); |
| 498 | { | ||
| 499 | return pci_register_driver(&superio_driver); | ||
| 500 | } | ||
| 501 | |||
| 502 | static void __exit superio_exit(void) | ||
| 503 | { | ||
| 504 | pci_unregister_driver(&superio_driver); | ||
| 505 | } | ||
| 506 | |||
| 507 | module_init(superio_modinit); | ||
| 508 | module_exit(superio_exit); | ||