Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-pxa / mmc.h

diff --git a/include/asm-arm/arch-pxa/mmc.h b/include/asm-arm/arch-pxa/mmc.h
index 9718063a211959472bce3f7990cbdd5e8257948b..b704c4f05f4ef390f8cc64c993151041c9668066 100644 (file)
--- a/include/asm-arm/arch-pxa/mmc.h
+++ b/include/asm-arm/arch-pxa/mmc.h
@@ -9,7 +9,8 @@ struct mmc_host;
 
 struct pxamci_platform_data {
        unsigned int ocr_mask;                  /* available voltages */
-       int (*init)(struct device *, irqreturn_t (*)(int, void *, struct pt_regs *), void *);
+       unsigned long detect_delay;             /* delay in jiffies before detecting cards after interrupt */
+       int (*init)(struct device *, irqreturn_t (*)(int, void *), void *);
        int (*get_ro)(struct device *);
        void (*setpower)(struct device *, unsigned int);
        void (*exit)(struct device *, void *);