diff options
author | Wolfgang Denk <wd@denx.de> | 2012-02-13 23:13:22 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2012-02-13 23:13:22 +0100 |
commit | 06576b2efcf3d67797437488e90e989b8b48c9f2 (patch) | |
tree | b6dd4e3ae4d09b221ec9c36f6793ba12668d0130 /drivers/mtd | |
parent | 9a3aae22edf1eda6326cc51c28631ca5c23b7706 (diff) | |
parent | 44f67f784889e1a27958fa3e995abe41ab925697 (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
* 'master' of git://git.denx.de/u-boot-blackfin:
Blackfin: pata_bfin: fix printf warning
Blackfin: bfin_nand: mark local func static
linkage.h: move from blackfin to common includes
Blackfin: br4: new board port
Blackfin: add in/out le32 variants
post: add blackfin to the post_time_ms list
Blackfin: bf537-stamp: drop board reset workaround
Blackfin: pr1: new board port
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/nand/bfin_nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/bfin_nand.c b/drivers/mtd/nand/bfin_nand.c index 3ee060f859..c7ddbb21d8 100644 --- a/drivers/mtd/nand/bfin_nand.c +++ b/drivers/mtd/nand/bfin_nand.c @@ -73,7 +73,7 @@ static void bfin_nfc_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl) SSYNC(); } -int bfin_nfc_devready(struct mtd_info *mtd) +static int bfin_nfc_devready(struct mtd_info *mtd) { pr_stamp(); return (bfin_read_NFC_STAT() & NBUSY) ? 1 : 0; |