Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / include / linux / spi / mmc_spi.h

diff --git a/include/linux/spi/mmc_spi.h b/include/linux/spi/mmc_spi.h
index d5ca78b93a3bbd9f9e78191cb5f7314622259045..a3626aedaec9350f9f17b19a12a6ade89a561b5c 100644 (file)
--- 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;