openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge master.kernel.org:/home/rmk/linux-2.6-mmc

This commit is contained in:
Linus Torvalds 2006-01-14 19:44:01 -08:00
parent 8d5c315059 51828abc17
commit 150a631fc5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/mmc/mmc_block.c
View File

@ -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);