From c350bed625c0421f51291eda486e5e27eb96b90d Mon Sep 17 00:00:00 2001
From: Richard Knutsson <ricknu-0@student.ltu.se>
Date: Wed, 30 Nov 2005 00:59:14 +0100
Subject: [PATCH] --- yaml --- r: 17521 b: refs/heads/master c:
 d1d6da8f9fb9a0633a2f36b84b292752d78f7d31 h: refs/heads/master i:   17519:
 4b373cb72777a246f2285b3a7be1495b087df01e v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/i386/kernel/scx200.c         | 2 +-
 trunk/arch/mips/vr41xx/common/vrc4173.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 53d81c9e4750..154911718cd2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 065c6359071c6d7d1f8b2839317471d1d97fc70b
+refs/heads/master: d1d6da8f9fb9a0633a2f36b84b292752d78f7d31
diff --git a/trunk/arch/i386/kernel/scx200.c b/trunk/arch/i386/kernel/scx200.c
index 9c968ae67c43..321f5fd26e75 100644
--- a/trunk/arch/i386/kernel/scx200.c
+++ b/trunk/arch/i386/kernel/scx200.c
@@ -143,7 +143,7 @@ static int __init scx200_init(void)
 {
 	printk(KERN_INFO NAME ": NatSemi SCx200 Driver\n");
 
-	return pci_module_init(&scx200_pci_driver);
+	return pci_register_driver(&scx200_pci_driver);
 }
 
 static void __exit scx200_cleanup(void)
diff --git a/trunk/arch/mips/vr41xx/common/vrc4173.c b/trunk/arch/mips/vr41xx/common/vrc4173.c
index 462a9af30eef..cc52e75e14e7 100644
--- a/trunk/arch/mips/vr41xx/common/vrc4173.c
+++ b/trunk/arch/mips/vr41xx/common/vrc4173.c
@@ -561,7 +561,7 @@ static int __devinit vrc4173_init(void)
 {
 	int err;
 
-	err = pci_module_init(&vrc4173_driver);
+	err = pci_register_driver(&vrc4173_driver);
 	if (err < 0)
 		return err;