OMAP: MMC: Introduce new multislot structure and change driver to use it

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

diff --git a/include/asm-arm/arch-omap/mmc.h b/include/asm-arm/arch-omap/mmc.h
index 1b0e5392f5c99fcd13f94b1883eb7f06e8a5106c..e25c329cd16857f709923221c448f0d8911e20fc 100644 (file)
--- a/include/asm-arm/arch-omap/mmc.h
+++ b/include/asm-arm/arch-omap/mmc.h
@@ -13,12 +13,13 @@
 
 #include <linux/types.h>
 #include <linux/device.h>
-#include <linux/mmc/protocol.h>
 #include <linux/mmc/host.h>
 
 #define OMAP_MMC_MAX_SLOTS     2
 
 struct omap_mmc_platform_data {
+       struct omap_mmc_conf    conf;
+
        unsigned enabled:1;
        /* number of slots on board */
        unsigned nr_slots:2;