git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
mtd
/
nand
/
cafe_nand.c
diff --git
a/drivers/mtd/nand/cafe_nand.c
b/drivers/mtd/nand/cafe_nand.c
index
29acd06
..
c828d9a
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,
* 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;
{
struct cafe_priv *cafe = mtd->priv;
@@
-903,12
+903,12
@@
static struct pci_driver cafe_nand_pci_driver = {
.resume = cafe_nand_resume,
};
.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);
}
{
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);
}
{
pci_unregister_driver(&cafe_nand_pci_driver);
}