summaryrefslogtreecommitdiffstats
path: root/include/linux/spi/mmc_spi.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-18 22:39:59 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-18 22:39:59 +0200
commit0679c2f47d50651018dd5e0bf35330f6e6ae35ec (patch)
tree2df65ebb958f930abf0b7ad35fd6e528398b1679 /include/linux/spi/mmc_spi.h
parent76fbc263ff7e42ce8b21b8aee176e3c74b45f81a (diff)
parent5b664cb235e97afbf34db9c4d77f08ebd725335e (diff)
downloadkernel-crypto-0679c2f47d50651018dd5e0bf35330f6e6ae35ec.tar.gz
kernel-crypto-0679c2f47d50651018dd5e0bf35330f6e6ae35ec.tar.xz
kernel-crypto-0679c2f47d50651018dd5e0bf35330f6e6ae35ec.zip
Merge branch 'linus' into pci-for-jesse
Diffstat (limited to 'include/linux/spi/mmc_spi.h')
-rw-r--r--include/linux/spi/mmc_spi.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/spi/mmc_spi.h b/include/linux/spi/mmc_spi.h
index d5ca78b93a3..a3626aedaec 100644
--- a/include/linux/spi/mmc_spi.h
+++ b/include/linux/spi/mmc_spi.h
@@ -23,6 +23,15 @@ struct mmc_spi_platform_data {
/* sense switch on sd cards */
int (*get_ro)(struct device *);
+ /*
+ * If board does not use CD interrupts, driver can optimize polling
+ * using this function.
+ */
+ int (*get_cd)(struct device *);
+
+ /* Capabilities to pass into mmc core (e.g. MMC_CAP_NEEDS_POLL). */
+ unsigned long caps;
+
/* how long to debounce card detect, in msecs */
u16 detect_delay;