tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 150a631f 8d5c3150

+3 -2
unified split
+3 -2
drivers/mmc/mmc_block.c
··· 462 if (err) 463 goto out; 464 465 - printk(KERN_INFO "%s: %s %s %luKiB %s\n", 466 md->disk->disk_name, mmc_card_id(card), mmc_card_name(card), 467 - get_capacity(md->disk) >> 1, md->read_only ? "(ro)" : ""); 468 469 mmc_set_drvdata(card, md); 470 add_disk(md->disk);
··· 462 if (err) 463 goto out; 464 465 + printk(KERN_INFO "%s: %s %s %lluKiB %s\n", 466 md->disk->disk_name, mmc_card_id(card), mmc_card_name(card), 467 + (unsigned long long)(get_capacity(md->disk) >> 1), 468 + md->read_only ? "(ro)" : ""); 469 470 mmc_set_drvdata(card, md); 471 add_disk(md->disk);