diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 19:44:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 19:44:01 -0800 |
| commit | 150a631fc55e33df28a6846371e7f86e9e75e8cb (patch) | |
| tree | 59b1cfdf3b497989e98832db0374c4193d3b9d48 | |
| parent | 8d5c315059460e665c804d5a9b641f7f0a1e9dd7 (diff) | |
| parent | 51828abc17a4ae0f7fb3879e00a30da7bdc7ca20 (diff) | |
| download | op-kernel-dev-150a631fc55e33df28a6846371e7f86e9e75e8cb.zip op-kernel-dev-150a631fc55e33df28a6846371e7f86e9e75e8cb.tar.gz | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
| -rw-r--r-- | drivers/mmc/mmc_block.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c index 9b7c37e..5b014c3 100644 --- a/drivers/mmc/mmc_block.c +++ b/drivers/mmc/mmc_block.c @@ -462,9 +462,10 @@ static int mmc_blk_probe(struct mmc_card *card) if (err) goto out; - printk(KERN_INFO "%s: %s %s %luKiB %s\n", + printk(KERN_INFO "%s: %s %s %lluKiB %s\n", md->disk->disk_name, mmc_card_id(card), mmc_card_name(card), - get_capacity(md->disk) >> 1, md->read_only ? "(ro)" : ""); + (unsigned long long)(get_capacity(md->disk) >> 1), + md->read_only ? "(ro)" : ""); mmc_set_drvdata(card, md); add_disk(md->disk); |
