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 /include/linux/mmc/sdio_func.h | |
| parent | b9914406fb128bee01b2a23a35eafbc83ff915f0 (diff) | |
| parent | 18aa04d882fe72eb59ea2c9e3f78400d85b6535f (diff) | |
Merge branch 'rmk-next' into s3c64xx
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 07bee4a0d45..451bdfc8583 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) |