summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2012-02-13 23:13:22 +0100
committerWolfgang Denk <wd@denx.de>2012-02-13 23:13:22 +0100
commit06576b2efcf3d67797437488e90e989b8b48c9f2 (patch)
treeb6dd4e3ae4d09b221ec9c36f6793ba12668d0130 /drivers
parent9a3aae22edf1eda6326cc51c28631ca5c23b7706 (diff)
parent44f67f784889e1a27958fa3e995abe41ab925697 (diff)
downloadu-boot-imx-06576b2efcf3d67797437488e90e989b8b48c9f2.zip
u-boot-imx-06576b2efcf3d67797437488e90e989b8b48c9f2.tar.gz
u-boot-imx-06576b2efcf3d67797437488e90e989b8b48c9f2.tar.bz2
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')
-rw-r--r--drivers/block/pata_bfin.c2
-rw-r--r--drivers/mtd/nand/bfin_nand.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/pata_bfin.c b/drivers/block/pata_bfin.c
index 847c032..cce21fb 100644
--- a/drivers/block/pata_bfin.c
+++ b/drivers/block/pata_bfin.c
@@ -884,7 +884,7 @@ static void bfin_ata_identify(struct ata_port *ap, int dev)
sata_dev_desc[ap->port_no].removable = 0;
sata_dev_desc[ap->port_no].lba = (u32) n_sectors;
- debug("lba=0x%x\n", sata_dev_desc[ap->port_no].lba);
+ debug("lba=0x%lx\n", sata_dev_desc[ap->port_no].lba);
#ifdef CONFIG_LBA48
if (iop->command_set_2 & 0x0400)
diff --git a/drivers/mtd/nand/bfin_nand.c b/drivers/mtd/nand/bfin_nand.c
index 3ee060f..c7ddbb2 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;