diff options
| author | Takashi Iwai | 2008-12-01 18:02:17 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2008-12-01 18:02:17 +0100 |
| commit | 3af4182cc5be7d5505f9801ee3297373f1872446 (patch) | |
| tree | 214348d40ed547a72f9612a7e5c94a01afded812 /include/linux/mmc/sdio_func.h | |
| parent | ALSA: soc - Remove obsoleted sound/driver.h inclusion (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff) | |
| download | kernel-qcow2-linux-3af4182cc5be7d5505f9801ee3297373f1872446.tar.gz kernel-qcow2-linux-3af4182cc5be7d5505f9801ee3297373f1872446.tar.xz kernel-qcow2-linux-3af4182cc5be7d5505f9801ee3297373f1872446.zip | |
Merge branch 'upstream' into topic/asoc
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 { #define sdio_func_set_present(f) ((f)->state |= SDIO_STATE_PRESENT) -#define sdio_func_id(f) ((f)->dev.bus_id) +#define sdio_func_id(f) (dev_name(&(f)->dev)) #define sdio_get_drvdata(f) dev_get_drvdata(&(f)->dev) #define sdio_set_drvdata(f,d) dev_set_drvdata(&(f)->dev, d) |