diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 18:28:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 18:28:16 -0400 |
| commit | 63068465fa9ba8258e341f70c07cd2221b8c114d (patch) | |
| tree | 79ec2bc8af8b95c09479ddc0661b2dec89281e92 /include/asm-arm | |
| parent | 35b7ac4c48fa851600c028e088d2239a2cf3dfca (diff) | |
| parent | c26971cbb39727b0b692c6236f890ba13046a663 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Diffstat (limited to 'include/asm-arm')
| -rw-r--r-- | include/asm-arm/arch-pxa/mmc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/arch-pxa/mmc.h b/include/asm-arm/arch-pxa/mmc.h index 9718063a2119..88c17dd02ed2 100644 --- a/include/asm-arm/arch-pxa/mmc.h +++ b/include/asm-arm/arch-pxa/mmc.h | |||
| @@ -9,6 +9,7 @@ struct mmc_host; | |||
| 9 | 9 | ||
| 10 | struct pxamci_platform_data { | 10 | struct pxamci_platform_data { |
| 11 | unsigned int ocr_mask; /* available voltages */ | 11 | unsigned int ocr_mask; /* available voltages */ |
| 12 | unsigned long detect_delay; /* delay in jiffies before detecting cards after interrupt */ | ||
| 12 | int (*init)(struct device *, irqreturn_t (*)(int, void *, struct pt_regs *), void *); | 13 | int (*init)(struct device *, irqreturn_t (*)(int, void *, struct pt_regs *), void *); |
| 13 | int (*get_ro)(struct device *); | 14 | int (*get_ro)(struct device *); |
| 14 | void (*setpower)(struct device *, unsigned int); | 15 | void (*setpower)(struct device *, unsigned int); |