summaryrefslogtreecommitdiff
path: root/drivers/mtd/maps/sa1100-flash.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-12-01 17:58:15 +0300
committerTakashi Iwai <tiwai@suse.de>2009-12-01 17:58:15 +0300
commitb00615d163cd24fa98d155acfc1f9d81d6fe1103 (patch)
treedde815788aaea3e336aaaf24763311ce63a22e1b /drivers/mtd/maps/sa1100-flash.c
parent75639e7ee1401b3876c7a00ffe96ea8027668690 (diff)
parentd6797322231af98b9bb4afb175dd614cf511e5f7 (diff)
downloadlinux-b00615d163cd24fa98d155acfc1f9d81d6fe1103.tar.xz
Merge branch 'topic/pcm-dma-fix' into topic/core-change
Diffstat (limited to 'drivers/mtd/maps/sa1100-flash.c')
-rw-r--r--drivers/mtd/maps/sa1100-flash.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index fdb97f3d30e9..d7a47574d21e 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -209,8 +209,8 @@ static int sa1100_probe_subdev(struct sa_subdev_info *subdev, struct resource *r
}
subdev->mtd->owner = THIS_MODULE;
- printk(KERN_INFO "SA1100 flash: CFI device at 0x%08lx, %dMiB, "
- "%d-bit\n", phys, subdev->mtd->size >> 20,
+ printk(KERN_INFO "SA1100 flash: CFI device at 0x%08lx, %uMiB, %d-bit\n",
+ phys, (unsigned)(subdev->mtd->size >> 20),
subdev->map.bankwidth * 8);
return 0;