Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

4 files changed, 4 insertions, 4 deletions

diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 4a7bb7dfce85..6ede1f352c29 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -7179,7 +7179,7 @@ static int DAC960_init_module(void)
 {
         int ret;
 
-        ret =  pci_module_init(&DAC960_pci_driver);
+        ret =  pci_register_driver(&DAC960_pci_driver);
 #ifdef DAC960_GAM_MINOR
         if (!ret)
                 DAC960_gam_init();
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index e4e9f255bd1f..12d7b9bdfa93 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -3360,7 +3360,7 @@ static int __init cciss_init(void)
         printk(KERN_INFO DRIVER_NAME "\n");
 
         /* Register for our PCI devices */
-        return pci_module_init(&cciss_pci_driver);
+        return pci_register_driver(&cciss_pci_driver);
 }
 
 static void __exit cciss_cleanup(void)
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index 4bdf95716e2b..2ae08b343b93 100644
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -1755,7 +1755,7 @@ static void carm_remove_one (struct pci_dev *pdev)
 
 static int __init carm_init(void)
 {
-        return pci_module_init(&carm_driver);
+        return pci_register_driver(&carm_driver);
 }
 
 static void __exit carm_exit(void)
diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index 15299e7a1ade..a3614e6a68d0 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -1174,7 +1174,7 @@ static int __init mm_init(void)
 
         printk(KERN_INFO DRIVER_VERSION " : " DRIVER_DESC "\n");
 
-        retval = pci_module_init(&mm_pci_driver);
+        retval = pci_register_driver(&mm_pci_driver);
         if (retval)
                 return -ENOMEM;