diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-01 18:02:27 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-01 18:02:27 -0400 |
| commit | ceeec3dc375e3b0618f16b34efc56fe093918f8b (patch) | |
| tree | 2293d02721ee05131aaf1c60e4fba7e281585eec /drivers/mmc/mmci.c | |
| parent | fbff868db3a4cc6a89d51da9a6d49b26c29d04fb (diff) | |
| parent | e3ee3b78f83688a0ae4315e8be71b2eac559904a (diff) | |
/spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'drivers/mmc/mmci.c')
| -rw-r--r-- | drivers/mmc/mmci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c index 7a42966d755b..716c4ef4faf6 100644 --- a/drivers/mmc/mmci.c +++ b/drivers/mmc/mmci.c | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | 34 | ||
| 35 | #ifdef CONFIG_MMC_DEBUG | 35 | #ifdef CONFIG_MMC_DEBUG |
| 36 | #define DBG(host,fmt,args...) \ | 36 | #define DBG(host,fmt,args...) \ |
| 37 | pr_debug("%s: %s: " fmt, host->mmc->host_name, __func__ , args) | 37 | pr_debug("%s: %s: " fmt, mmc_hostname(host->mmc), __func__ , args) |
| 38 | #else | 38 | #else |
| 39 | #define DBG(host,fmt,args...) do { } while (0) | 39 | #define DBG(host,fmt,args...) do { } while (0) |
| 40 | #endif | 40 | #endif |
| @@ -541,7 +541,7 @@ static int mmci_probe(struct amba_device *dev, void *id) | |||
| 541 | mmc_add_host(mmc); | 541 | mmc_add_host(mmc); |
| 542 | 542 | ||
| 543 | printk(KERN_INFO "%s: MMCI rev %x cfg %02x at 0x%08lx irq %d,%d\n", | 543 | printk(KERN_INFO "%s: MMCI rev %x cfg %02x at 0x%08lx irq %d,%d\n", |
| 544 | mmc->host_name, amba_rev(dev), amba_config(dev), | 544 | mmc_hostname(mmc), amba_rev(dev), amba_config(dev), |
| 545 | dev->res.start, dev->irq[0], dev->irq[1]); | 545 | dev->res.start, dev->irq[0], dev->irq[1]); |
| 546 | 546 | ||
| 547 | init_timer(&host->timer); | 547 | init_timer(&host->timer); |