diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-02 23:57:59 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-02 23:57:59 -0800 |
| commit | 950f564b707ca1b1c5bb94cd1e7d2a0702bfcadc (patch) | |
| tree | 290cc32af2f8cfd232c57d491733592aed4dbf88 /drivers/ide/scc_pata.c | |
| parent | b1681c56f5b6bf551bed2617a395855055836571 (diff) | |
| parent | 8495fb1b8d016657133c01a2f258c5f192d2a1b7 (diff) | |
| download | linux-950f564b707ca1b1c5bb94cd1e7d2a0702bfcadc.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ide-2.6
Diffstat (limited to 'drivers/ide/scc_pata.c')
| -rw-r--r-- | drivers/ide/scc_pata.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c index e9d4b441d1c3..b7f5b0c4310c 100644 --- a/drivers/ide/scc_pata.c +++ b/drivers/ide/scc_pata.c @@ -872,20 +872,18 @@ static struct pci_driver scc_pci_driver = { .remove = __devexit_p(scc_remove), }; -static int scc_ide_init(void) +static int __init scc_ide_init(void) { return ide_pci_register_driver(&scc_pci_driver); } -module_init(scc_ide_init); -/* -- No exit code? -static void scc_ide_exit(void) +static void __exit scc_ide_exit(void) { - ide_pci_unregister_driver(&scc_pci_driver); + pci_unregister_driver(&scc_pci_driver); } -module_exit(scc_ide_exit); - */ +module_init(scc_ide_init); +module_exit(scc_ide_exit); MODULE_DESCRIPTION("PCI driver module for Toshiba SCC IDE"); MODULE_LICENSE("GPL"); |