diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-09 14:14:16 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-09 14:14:16 -0500 |
| commit | 02cabab4a8a7ef2d51189d5dda84516d36662910 (patch) | |
| tree | 1e6773a81e151d4744f8d643bda5348ac49561fa /include/linux/mmc/sdio_func.h | |
| parent | bbda14dfba26bd4ca5dc74f672518bc42120d765 (diff) | |
| parent | d1b268630875a7713b5d468a0c03403c5b721c8e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
mmc: struct device - replace bus_id with dev_name(), dev_set_name()
mmc: increase SD write timeout for crappy cards
Diffstat (limited to 'include/linux/mmc/sdio_func.h')
| -rw-r--r-- | include/linux/mmc/sdio_func.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mmc/sdio_func.h b/include/linux/mmc/sdio_func.h index 07bee4a0d457..451bdfc85830 100644 --- a/include/linux/mmc/sdio_func.h +++ b/include/linux/mmc/sdio_func.h | |||
| @@ -63,7 +63,7 @@ struct sdio_func { | |||
| 63 | 63 | ||
| 64 | #define sdio_func_set_present(f) ((f)->state |= SDIO_STATE_PRESENT) | 64 | #define sdio_func_set_present(f) ((f)->state |= SDIO_STATE_PRESENT) |
| 65 | 65 | ||
| 66 | #define sdio_func_id(f) ((f)->dev.bus_id) | 66 | #define sdio_func_id(f) (dev_name(&(f)->dev)) |
| 67 | 67 | ||
| 68 | #define sdio_get_drvdata(f) dev_get_drvdata(&(f)->dev) | 68 | #define sdio_get_drvdata(f) dev_get_drvdata(&(f)->dev) |
| 69 | #define sdio_set_drvdata(f,d) dev_set_drvdata(&(f)->dev, d) | 69 | #define sdio_set_drvdata(f,d) dev_set_drvdata(&(f)->dev, d) |