summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-05-26 09:36:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-26 09:36:31 -0700
commit95f4838e21945b9d9718f55afeb7edc8c39858b9 (patch)
tree1efa4bd9fca0b525664c336da4dd515b7e49ddb4 /drivers
parent088d812fe97a4cc8edaed69f91511ea063b14cef (diff)
parentd96b51ec14650b490ab98e738bcc02309396e5bc (diff)
downloadlinux-stable-95f4838e21945b9d9718f55afeb7edc8c39858b9.tar.gz
linux-stable-95f4838e21945b9d9718f55afeb7edc8c39858b9.tar.bz2
linux-stable-95f4838e21945b9d9718f55afeb7edc8c39858b9.zip
Merge branch 'parisc-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc fixes from Helge Deller: "This time we made the kernel- and interruption stack allocation reentrant which fixed some strange kernel crashes (specifically protection ID traps). Furthemore this patchset fixes the interrupt stack in UP and SMP configurations by using native locking instructions. And finally usage of floating point calculations on parisc were disabled in the MPILIB." * 'parisc-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: parisc: fix irq stack on UP and SMP parisc/superio: Use module_pci_driver to register driver parisc: make interrupt and interruption stack allocation reentrant parisc: show number of FPE and unaligned access handler calls in /proc/interrupts parisc: add additional parisc git tree to MAINTAINERS file parisc: use PAGE_SHIFT instead of hardcoded value 12 in pacache.S parisc: add rp5470 entry to machine database MPILIB: disable usage of floating point registers on parisc
Diffstat (limited to 'drivers')
-rw-r--r--drivers/parisc/superio.c13
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 = {
.probe = superio_probe,
};
-static int __init superio_modinit(void)
-{
- return pci_register_driver(&superio_driver);
-}
-
-static void __exit superio_exit(void)
-{
- pci_unregister_driver(&superio_driver);
-}
-
-module_init(superio_modinit);
-module_exit(superio_exit);
+module_pci_driver(superio_driver);