Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6-omap-h63xx.git] / drivers / mtd / maps / ck804xrom.c

diff --git a/drivers/mtd/maps/ck804xrom.c b/drivers/mtd/maps/ck804xrom.c
index 3d4a4d8ac789758b677b796cb83048ba59a93d47..688ef495888a6ba1efeef5ccff6f9a9646c4a102 100644 (file)
--- a/drivers/mtd/maps/ck804xrom.c
+++ b/drivers/mtd/maps/ck804xrom.c
@@ -338,7 +338,7 @@ static int __init init_ck804xrom(void)
        }
        return -ENXIO;
 #if 0
-       return pci_module_init(&ck804xrom_driver);
+       return pci_register_driver(&ck804xrom_driver);
 #endif
 }