diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-11-12 08:43:22 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-11-12 08:43:22 +1100 |
| commit | 486936cd93e99c802153b3f2f629c5ce62b8c0d4 (patch) | |
| tree | 51e261a96e1fb6b51d4a6afb92bfc2480e150b6c /include/linux/mmc/card.h | |
| parent | 1c1b777a5673b57a6c0377ba60a790d05e4a0676 (diff) | |
| parent | f21f237cf55494c3a4209de323281a3b0528da10 (diff) | |
| download | op-kernel-dev-486936cd93e99c802153b3f2f629c5ce62b8c0d4.zip op-kernel-dev-486936cd93e99c802153b3f2f629c5ce62b8c0d4.tar.gz | |
Merge branch 'linux-2.6' into next
Diffstat (limited to 'include/linux/mmc/card.h')
| -rw-r--r-- | include/linux/mmc/card.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index ee6e822..403aa50 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -130,7 +130,7 @@ struct mmc_card { #define mmc_card_set_blockaddr(c) ((c)->state |= MMC_STATE_BLOCKADDR) #define mmc_card_name(c) ((c)->cid.prod_name) -#define mmc_card_id(c) ((c)->dev.bus_id) +#define mmc_card_id(c) (dev_name(&(c)->dev)) #define mmc_list_to_card(l) container_of(l, struct mmc_card, node) #define mmc_get_drvdata(c) dev_get_drvdata(&(c)->dev) |
