Merge branch 'linus' into core/urgent

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / include / mach / board.h

diff --git a/arch/arm/plat-omap/include/mach/board.h b/arch/arm/plat-omap/include/mach/board.h
index 54445642f35d4ff4fd54e137fdcf845acdfb9238..c23c12ccb3532c912285a70ef012dd6b030ff5b1 100644 (file)
--- a/arch/arm/plat-omap/include/mach/board.h
+++ b/arch/arm/plat-omap/include/mach/board.h
@@ -45,6 +45,8 @@ struct omap_mmc_conf {
        unsigned cover:1;
        /* 4 wire signaling is optional, and is only used for SD/SDIO */
        unsigned wire4:1;
+       /* use the internal clock */
+       unsigned internal_clock:1;
        s16 power_pin;
        s16 switch_pin;
        s16 wp_pin;