Merge master.kernel.org:/home/rmk/linux-2.6-mmc

This commit is contained in:
Linus Torvalds 2005-09-08 15:28:16 -07:00
commit 63068465fa
6 changed files with 23 additions and 10 deletions

View file

@ -9,6 +9,7 @@ struct mmc_host;
struct pxamci_platform_data {
unsigned int ocr_mask; /* available voltages */
unsigned long detect_delay; /* delay in jiffies before detecting cards after interrupt */
int (*init)(struct device *, irqreturn_t (*)(int, void *, struct pt_regs *), void *);
int (*get_ro)(struct device *);
void (*setpower)(struct device *, unsigned int);