diff options
| author | James Morris <jmorris@namei.org> | 2008-11-14 11:29:12 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-11-14 11:29:12 +1100 |
| commit | 2b828925652340277a889cbc11b2d0637f7cdaf7 (patch) | |
| tree | 32fcb3d3e466fc419fad2d3717956a5b5ad3d35a /include/linux/mmc/host.h | |
| parent | 3a3b7ce9336952ea7b9564d976d068a238976c9d (diff) | |
| parent | 58e20d8d344b0ee083febb18c2b021d2427e56ca (diff) | |
| download | linux-rt-2b828925652340277a889cbc11b2d0637f7cdaf7.tar.gz | |
Merge branch 'master' into next
Conflicts:
security/keys/internal.h
security/keys/process_keys.c
security/keys/request_key.c
Fixed conflicts above by using the non 'tsk' versions.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'include/linux/mmc/host.h')
| -rw-r--r-- | include/linux/mmc/host.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index bde891f64591..f842f234e44f 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -176,7 +176,7 @@ static inline void *mmc_priv(struct mmc_host *host) #define mmc_dev(x) ((x)->parent) #define mmc_classdev(x) (&(x)->class_dev) -#define mmc_hostname(x) ((x)->class_dev.bus_id) +#define mmc_hostname(x) (dev_name(&(x)->class_dev)) extern int mmc_suspend_host(struct mmc_host *, pm_message_t); extern int mmc_resume_host(struct mmc_host *); |