summaryrefslogtreecommitdiffstats
path: root/include/linux/mfd/sh_mobile_sdhi.h
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-05-25 00:38:26 -0600
committerGrant Likely <grant.likely@secretlab.ca>2010-05-25 00:38:26 -0600
commitb1e50ebcf24668e57f058deb48b0704b5391ed0f (patch)
tree17e1b69b249d0738317b732186340c9dd053f1a1 /include/linux/mfd/sh_mobile_sdhi.h
parent0c2a2ae32793e3500a15a449612485f5d17dd431 (diff)
parent7e125f7b9cbfce4101191b8076d606c517a73066 (diff)
downloadop-kernel-dev-b1e50ebcf24668e57f058deb48b0704b5391ed0f.zip
op-kernel-dev-b1e50ebcf24668e57f058deb48b0704b5391ed0f.tar.gz
Merge remote branch 'origin' into secretlab/next-spi
Diffstat (limited to 'include/linux/mfd/sh_mobile_sdhi.h')
-rw-r--r--include/linux/mfd/sh_mobile_sdhi.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/mfd/sh_mobile_sdhi.h b/include/linux/mfd/sh_mobile_sdhi.h
index 3bcd716..4906780 100644
--- a/include/linux/mfd/sh_mobile_sdhi.h
+++ b/include/linux/mfd/sh_mobile_sdhi.h
@@ -1,7 +1,13 @@
#ifndef __SH_MOBILE_SDHI_H__
#define __SH_MOBILE_SDHI_H__
+#include <linux/types.h>
+
struct sh_mobile_sdhi_info {
+ int dma_slave_tx;
+ int dma_slave_rx;
+ unsigned long tmio_flags;
+ u32 tmio_ocr_mask; /* available MMC voltages */
void (*set_pwr)(struct platform_device *pdev, int state);
};
OpenPOWER on IntegriCloud