Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-imx / mmc.h

diff --git a/include/asm-arm/arch-imx/mmc.h b/include/asm-arm/arch-imx/mmc.h
index 1937151665c75d896e512fef426ccd9e354e6e37..4712f354dcca1e40dcfaa91eb5cb62a9572a70d9 100644 (file)
--- a/include/asm-arm/arch-imx/mmc.h
+++ b/include/asm-arm/arch-imx/mmc.h
@@ -1,10 +1,13 @@
 #ifndef ASMARM_ARCH_MMC_H
 #define ASMARM_ARCH_MMC_H
 
-#include <linux/mmc/protocol.h>
+#include <linux/mmc/host.h>
+
+struct device;
 
 struct imxmmc_platform_data {
-       int (*card_present)(void);
+       int (*card_present)(struct device *);
+       int (*get_ro)(struct device *);
 };
 
 extern void imx_set_mmc_info(struct imxmmc_platform_data *info);