Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[~andy/linux] / drivers / video / cyblafb.c

diff --git a/drivers/video/cyblafb.c b/drivers/video/cyblafb.c
index e9f5dee67e3ccec6c873119ea8e3964954b94d7e..94a66c2d2cf528a7f9f31c1c209ef3841f6433a1 100644 (file)
--- a/drivers/video/cyblafb.c
+++ b/drivers/video/cyblafb.c
@@ -14,7 +14,6 @@
 
 #define CYBLAFB_PIXMAPSIZE 8192
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/fb.h>
@@ -1665,7 +1664,7 @@ static int __devinit cyblafb_init(void)
                }
 #endif
        output("CyblaFB version %s initializing\n", VERSION);
-       return pci_module_init(&cyblafb_pci_driver);
+       return pci_register_driver(&cyblafb_pci_driver);
 }
 
 static void __exit cyblafb_exit(void)