Merge git://git.infradead.org/mtd-2.6

[deliverable/linux.git] / drivers / mtd / nand / cafe_nand.c

diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c
index 29acd06b1c39709000b65973d29a75f41dfd347d..c828d9ac7bd71a7709fac3ea16bd1e9419e062f6 100644 (file)
--- a/drivers/mtd/nand/cafe_nand.c
+++ b/drivers/mtd/nand/cafe_nand.c
@@ -381,7 +381,7 @@ static int cafe_nand_read_oob(struct mtd_info *mtd, struct nand_chip *chip,
  * we need a special oob layout and handling.
  */
 static int cafe_nand_read_page(struct mtd_info *mtd, struct nand_chip *chip,
-                              uint8_t *buf)
+                              uint8_t *buf, int page)
 {
        struct cafe_priv *cafe = mtd->priv;
 
@@ -903,12 +903,12 @@ static struct pci_driver cafe_nand_pci_driver = {
        .resume = cafe_nand_resume,
 };
 
-static int cafe_nand_init(void)
+static int __init cafe_nand_init(void)
 {
        return pci_register_driver(&cafe_nand_pci_driver);
 }
 
-static void cafe_nand_exit(void)
+static void __exit cafe_nand_exit(void)
 {
        pci_unregister_driver(&cafe_nand_pci_driver);
 }