diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-26 21:30:38 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-26 21:30:38 -0400 |
| commit | 835d39fcb56cba00b78c60634d6bb0f046ef601c (patch) | |
| tree | 235cecc646bada5c0b76836d42e44e7a5d93c0f8 /drivers/mmc | |
| parent | 89bad5892abca55f56d0ea713c7306d1f845ac8e (diff) | |
| parent | ecd68853b852cdafb138f9c437f3a751fe7dc381 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/mmc_block.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/mmc_block.c b/drivers/mmc/mmc_block.c index e39cc05c64c2..587458b370b9 100644 --- a/drivers/mmc/mmc_block.c +++ b/drivers/mmc/mmc_block.c | |||
| @@ -353,7 +353,7 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card) | |||
| 353 | */ | 353 | */ |
| 354 | printk(KERN_ERR "%s: unable to select block size for " | 354 | printk(KERN_ERR "%s: unable to select block size for " |
| 355 | "writing (rb%u wb%u rp%u wp%u)\n", | 355 | "writing (rb%u wb%u rp%u wp%u)\n", |
| 356 | md->disk->disk_name, | 356 | mmc_card_id(card), |
| 357 | 1 << card->csd.read_blkbits, | 357 | 1 << card->csd.read_blkbits, |
| 358 | 1 << card->csd.write_blkbits, | 358 | 1 << card->csd.write_blkbits, |
| 359 | card->csd.read_partial, | 359 | card->csd.read_partial, |