sdhci-pci: use X86_MDFLD to replace X86_MRST
authorChuanxiao Dong <chuanxiao.dong@intel.com>
Fri, 3 Feb 2012 09:17:45 +0000 (17:17 +0800)
committerbuildbot <buildbot@intel.com>
Mon, 6 Feb 2012 04:48:45 +0000 (20:48 -0800)
BZ: 22235

In R3, kernel is using X86_MDFLD but not X86_MRST for MFLD
project. sdhci-pci.c need to be updated accordingly otherwise
some functions depends on X86_MDFLD cannot be used.

Change-Id: Ica51ad2095d497cf7bee00e44f510cb3cc5678c0
Signed-off-by: Chuanxiao Dong <chuanxiao.dong@intel.com>
Reviewed-on: http://android.intel.com:8080/33851
Reviewed-by: Tang, Richard <richard.tang@intel.com>
Reviewed-by: Gross, Mark <mark.gross@intel.com>
Tested-by: Sun, Jianhua <jianhua.sun@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
drivers/mmc/host/sdhci-pci.c

index 1c37152..c5e57ed 100644 (file)
@@ -26,7 +26,7 @@
 #include <linux/pm_runtime.h>
 #include <asm/intel_scu_ipc.h>
 
-#if defined(CONFIG_X86_MRST)
+#if defined(CONFIG_X86_MDFLD)
 #include <linux/intel_mid_pm.h>
 #endif
 
@@ -1188,7 +1188,7 @@ static void sdhci_pci_hw_reset(struct sdhci_host *host)
        usleep_range(300, 1000);
 }
 
-#if defined(CONFIG_X86_MRST)
+#if defined(CONFIG_X86_MDFLD)
 static int sdhci_pci_power_up_host(struct sdhci_host *host)
 {
        int ret;