diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-08-10 12:56:51 +0200 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-08-10 12:56:51 +0200 |
commit | 79ed35a9f139ad2b2653dfdd5f45a8f1453e2cbb (patch) | |
tree | 1f97c3bfd3ae9995a1e396c5a6c02bf5a346b55c /drivers/scsi/sata_sis.c | |
parent | Merge branch 'upstream-fixes' into upstream (diff) | |
parent | [PATCH] libata: replace pci_module_init() with pci_register_driver() (diff) | |
download | linux-79ed35a9f139ad2b2653dfdd5f45a8f1453e2cbb.tar.xz linux-79ed35a9f139ad2b2653dfdd5f45a8f1453e2cbb.zip |
Merge branch 'tj-upstream-pci_register_driver' of git://htj.dyndns.org/libata-tj into upstream
Diffstat (limited to 'drivers/scsi/sata_sis.c')
-rw-r--r-- | drivers/scsi/sata_sis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c index ee6b5df41d30..ac24f66897f6 100644 --- a/drivers/scsi/sata_sis.c +++ b/drivers/scsi/sata_sis.c @@ -334,7 +334,7 @@ err_out: static int __init sis_init(void) { - return pci_module_init(&sis_pci_driver); + return pci_register_driver(&sis_pci_driver); } static void __exit sis_exit(void) |