diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 13:35:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 13:35:21 -0400 |
commit | 9ab7486e446447c8e62f8f46ca85b809e6a9d491 (patch) | |
tree | eabab23a08b361a204523e46147c930c318d5520 /drivers/mmc/wbsd.c | |
parent | 975f957dc408925805dd8f5aa4217b7eeea2d005 (diff) | |
parent | dce773771834221817e2d359a7e07a618ba08807 (diff) |
Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-mmc.git
Diffstat (limited to 'drivers/mmc/wbsd.c')
-rw-r--r-- | drivers/mmc/wbsd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c index 974f2f36bdbe..402c2d661fb2 100644 --- a/drivers/mmc/wbsd.c +++ b/drivers/mmc/wbsd.c | |||
@@ -1796,7 +1796,7 @@ static int __devinit wbsd_init(struct device* dev, int base, int irq, int dma, | |||
1796 | 1796 | ||
1797 | mmc_add_host(mmc); | 1797 | mmc_add_host(mmc); |
1798 | 1798 | ||
1799 | printk(KERN_INFO "%s: W83L51xD", mmc->host_name); | 1799 | printk(KERN_INFO "%s: W83L51xD", mmc_hostname(mmc)); |
1800 | if (host->chip_id != 0) | 1800 | if (host->chip_id != 0) |
1801 | printk(" id %x", (int)host->chip_id); | 1801 | printk(" id %x", (int)host->chip_id); |
1802 | printk(" at 0x%x irq %d", (int)host->base, (int)host->irq); | 1802 | printk(" at 0x%x irq %d", (int)host->base, (int)host->irq); |