diff options
author | Mark Brown <broonie@linaro.org> | 2013-08-15 11:37:38 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-08-15 11:37:38 +0100 |
commit | 743c5bb898be45009770c144e5e14e4f448e56b9 (patch) | |
tree | 40fff57c975f89da4a90922c165595840e99093a /include/linux/platform_data | |
parent | 8fe120b5a665fc869c23f86e4964b801f6e53486 (diff) | |
parent | b7ae6f31d8243ec684af16bc5c763eccdfabaec0 (diff) | |
download | op-kernel-dev-743c5bb898be45009770c144e5e14e4f448e56b9.zip op-kernel-dev-743c5bb898be45009770c144e5e14e4f448e56b9.tar.gz |
Merge branch 'topic/dma' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-omap
Conflicts:
sound/soc/omap/Kconfig
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 9eb515b..1706b35 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 */ |