From 92845eaa488f15af9fd678d0230d0d62e80c23c5 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Tue, 1 May 2012 15:49:52 +0200 Subject: [PATCH] --- yaml --- r: 312824 b: refs/heads/master c: 5c08d7fae0815cd163a98e05c8d94fc0de77ff67 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/mmc/host.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 33361a0cbd12..7f67bf2f6a5b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27410ee7e391ce650d6d0242805f080599be7ad7 +refs/heads/master: 5c08d7fae0815cd163a98e05c8d94fc0de77ff67 diff --git a/trunk/include/linux/mmc/host.h b/trunk/include/linux/mmc/host.h index 90b6a38b0374..c1a03eed1d17 100644 --- a/trunk/include/linux/mmc/host.h +++ b/trunk/include/linux/mmc/host.h @@ -256,6 +256,8 @@ struct mmc_host { #define MMC_CAP2_BROKEN_VOLTAGE (1 << 7) /* Use the broken voltage */ #define MMC_CAP2_DETECT_ON_ERR (1 << 8) /* On I/O err check card removal */ #define MMC_CAP2_HC_ERASE_SZ (1 << 9) /* High-capacity erase size */ +#define MMC_CAP2_CD_ACTIVE_HIGH (1 << 10) /* Card-detect signal active high */ +#define MMC_CAP2_RO_ACTIVE_HIGH (1 << 11) /* Write-protect signal active high */ mmc_pm_flag_t pm_caps; /* supported pm features */ unsigned int power_notify_type;