Merge branch 'i915fb' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelf...

[linux-2.6-omap-h63xx.git] / arch / i386 / kernel / scx200.c

diff --git a/arch/i386/kernel/scx200.c b/arch/i386/kernel/scx200.c
index 9c968ae67c43dd1d4c008db3f37c8bc64a9f802d..321f5fd26e75062ef2119710e9ce1b7047ac662c 100644 (file)
--- a/arch/i386/kernel/scx200.c
+++ b/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)