diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-12-10 09:19:18 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-12-10 09:19:18 -0500 |
| commit | 2ade0c1d9d93b7642212657ef76f4a1e30233711 (patch) | |
| tree | 63bc720c0ffe5f4760cac4ed617b9870b050175e /include/linux/mfd/sh_mobile_sdhi.h | |
| parent | 504499f22c08a03e2e19dc88d31aa0ecd2ac815e (diff) | |
| parent | 6313e3c21743cc88bb5bd8aa72948ee1e83937b6 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/linux/mfd/sh_mobile_sdhi.h')
| -rw-r--r-- | include/linux/mfd/sh_mobile_sdhi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mfd/sh_mobile_sdhi.h b/include/linux/mfd/sh_mobile_sdhi.h index 49067802a6d7..c981b959760f 100644 --- a/include/linux/mfd/sh_mobile_sdhi.h +++ b/include/linux/mfd/sh_mobile_sdhi.h | |||
| @@ -7,8 +7,10 @@ struct sh_mobile_sdhi_info { | |||
| 7 | int dma_slave_tx; | 7 | int dma_slave_tx; |
| 8 | int dma_slave_rx; | 8 | int dma_slave_rx; |
| 9 | unsigned long tmio_flags; | 9 | unsigned long tmio_flags; |
| 10 | unsigned long tmio_caps; | ||
| 10 | u32 tmio_ocr_mask; /* available MMC voltages */ | 11 | u32 tmio_ocr_mask; /* available MMC voltages */ |
| 11 | void (*set_pwr)(struct platform_device *pdev, int state); | 12 | void (*set_pwr)(struct platform_device *pdev, int state); |
| 13 | int (*get_cd)(struct platform_device *pdev); | ||
| 12 | }; | 14 | }; |
| 13 | 15 | ||
| 14 | #endif /* __SH_MOBILE_SDHI_H__ */ | 16 | #endif /* __SH_MOBILE_SDHI_H__ */ |