diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 17:35:21 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 17:35:21 (GMT) |
| commit | 9ab7486e446447c8e62f8f46ca85b809e6a9d491 (patch) | |
| tree | eabab23a08b361a204523e46147c930c318d5520 /drivers/mmc/mmci.c | |
| parent | 975f957dc408925805dd8f5aa4217b7eeea2d005 (diff) | |
| parent | dce773771834221817e2d359a7e07a618ba08807 (diff) | |
| download | linux-fsl-qoriq-9ab7486e446447c8e62f8f46ca85b809e6a9d491.tar.xz | |
Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-mmc.git
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 7a42966..716c4ef 100644 --- a/drivers/mmc/mmci.c +++ b/drivers/mmc/mmci.c @@ -34,7 +34,7 @@ #ifdef CONFIG_MMC_DEBUG #define DBG(host,fmt,args...) \ - pr_debug("%s: %s: " fmt, host->mmc->host_name, __func__ , args) + pr_debug("%s: %s: " fmt, mmc_hostname(host->mmc), __func__ , args) #else #define DBG(host,fmt,args...) do { } while (0) #endif @@ -541,7 +541,7 @@ static int mmci_probe(struct amba_device *dev, void *id) mmc_add_host(mmc); printk(KERN_INFO "%s: MMCI rev %x cfg %02x at 0x%08lx irq %d,%d\n", - mmc->host_name, amba_rev(dev), amba_config(dev), + mmc_hostname(mmc), amba_rev(dev), amba_config(dev), dev->res.start, dev->irq[0], dev->irq[1]); init_timer(&host->timer); |