Merge branches 'topic/fix/hda' and 'topic/fix/sound-core' into for-linus

[linux-block.git] / include / linux / mmc / core.h

diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index d0c3abed74c2cbb5cbc71c6bd563bd04dad03fdc..143cebf0586f140fd267bf360d69654281584d11 100644 (file)
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -135,6 +135,7 @@ extern int mmc_wait_for_app_cmd(struct mmc_host *, struct mmc_card *,
        struct mmc_command *, int);
 
 extern void mmc_set_data_timeout(struct mmc_data *, const struct mmc_card *);
+extern unsigned int mmc_align_data_size(struct mmc_card *, unsigned int);
 
 extern int __mmc_claim_host(struct mmc_host *host, atomic_t *abort);
 extern void mmc_release_host(struct mmc_host *host);