diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-08-27 17:04:24 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-08-27 17:05:17 +0200 |
| commit | 66a61fc0b2c3475f26f65b5f29ed5945b8efbf9e (patch) | |
| tree | 28ebaaee56786cd9199e0e5802d166474d30d1e3 /drivers/ata/pata_triflex.c | |
| parent | HID: hid-debug: Show rdesc for unclaimed devices (diff) | |
| parent | Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-66a61fc0b2c3475f26f65b5f29ed5945b8efbf9e.tar.xz linux-66a61fc0b2c3475f26f65b5f29ed5945b8efbf9e.zip | |
Merge branch 'master' into upstream
Sync with Linus' tree so that we don't have build falures
due to Quanta 3001 ID reshuffling.
Diffstat (limited to 'drivers/ata/pata_triflex.c')
| -rw-r--r-- | drivers/ata/pata_triflex.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c index 28da1c6becf1..c8e589d91231 100644 --- a/drivers/ata/pata_triflex.c +++ b/drivers/ata/pata_triflex.c @@ -240,21 +240,10 @@ static struct pci_driver triflex_pci_driver = { #endif }; -static int __init triflex_init(void) -{ - return pci_register_driver(&triflex_pci_driver); -} - -static void __exit triflex_exit(void) -{ - pci_unregister_driver(&triflex_pci_driver); -} +module_pci_driver(triflex_pci_driver); MODULE_AUTHOR("Alan Cox"); MODULE_DESCRIPTION("low-level driver for Compaq Triflex"); MODULE_LICENSE("GPL"); MODULE_DEVICE_TABLE(pci, triflex); MODULE_VERSION(DRV_VERSION); - -module_init(triflex_init); -module_exit(triflex_exit); |