Merge HEAD from oss.sgi.com:/oss/git/linux-2.6.git

[linux-2.6] / drivers / video / cyblafb.c

diff --git a/drivers/video/cyblafb.c b/drivers/video/cyblafb.c
index e9f5dee67e3ccec6c873119ea8e3964954b94d7e..2b972461a030b9f2cfa92ee4aea4a62fa2c8b56e 100644 (file)
--- a/drivers/video/cyblafb.c
+++ b/drivers/video/cyblafb.c
@@ -1666,6 +1666,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)