diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-11-19 15:54:50 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-19 15:54:50 +0000 |
| commit | 0fc24c1ebff281406d66840cbaa6d303bc2cae24 (patch) | |
| tree | b3cacbb64fa31671d2f6241f38b5dd31db4a643a /drivers/mmc/host/sdhci.c | |
| parent | b9914406fb128bee01b2a23a35eafbc83ff915f0 (diff) | |
| parent | 18aa04d882fe72eb59ea2c9e3f78400d85b6535f (diff) | |
Merge branch 'rmk-next' into s3c64xx
Diffstat (limited to 'drivers/mmc/host/sdhci.c')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 280f3eafac9..ed2c89254df 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1786,7 +1786,7 @@ int sdhci_add_host(struct sdhci_host *host) mmc_add_host(mmc); printk(KERN_INFO "%s: SDHCI controller on %s [%s] using %s%s\n", - mmc_hostname(mmc), host->hw_name, mmc_dev(mmc)->bus_id, + mmc_hostname(mmc), host->hw_name, dev_name(mmc_dev(mmc)), (host->flags & SDHCI_USE_ADMA)?"A":"", (host->flags & SDHCI_USE_DMA)?"DMA":"PIO"); |