diff options
| author |   Mark Brown <broonie@linaro.org> | 2013-08-13 10:19:23 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-13 10:19:23 +0100 |
| commit | 4bd93343124ffe3bdc21c2b485c2668aba6651be (patch) | |
| tree | 4dd0ce9dd93b3ed8bce9126e4407207fb01839cd /include/linux/platform_data | |
| parent | ASoC: avoid duplicated DAI routes (diff) | |
| parent | Linux 3.11-rc5 (diff) | |
Merge tag 'v3.11-rc5' into asoc-dapm
Linux 3.11-rc5
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/mmc-pxamci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/platform_data/mmc-pxamci.h b/include/linux/platform_data/mmc-pxamci.h index 9eb515bb799d..1706b3597ce0 100644 --- a/include/linux/platform_data/mmc-pxamci.h +++ b/include/linux/platform_data/mmc-pxamci.h @@ -12,7 +12,7 @@ struct pxamci_platform_data { unsigned long detect_delay_ms; /* delay in millisecond before detecting cards after interrupt */ int (*init)(struct device *, irq_handler_t , void *); int (*get_ro)(struct device *); - void (*setpower)(struct device *, unsigned int); + int (*setpower)(struct device *, unsigned int); void (*exit)(struct device *, void *); int gpio_card_detect; /* gpio detecting card insertion */ int gpio_card_ro; /* gpio detecting read only toggle */ |