diff options
author | Shawn Guo <shawn.guo@freescale.com> | 2014-04-14 00:55:13 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@freescale.com> | 2014-05-12 10:58:46 -0400 |
commit | 5f48c914b5d636dfe5190f2feb0629c4a9e7b814 (patch) | |
tree | d392137cc3813f3caec5168d2debdcc9b497aaec | |
parent | ee3387f97bea00f99add9efe2d2b29374a49af41 (diff) |
ARM: imx: drop CONFIG_MMC_UNSAFE_RESUME from defconfig
Since 2501c91 (mmc: core: Use MMC_UNSAFE_RESUME as default behavior),
CONFIG_MMC_UNSAFE_RESUME is not available anymore. Drop it from imx
defconfig.
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
-rw-r--r-- | arch/arm/configs/imx_v4_v5_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/configs/mxs_defconfig | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig index ec9b36580952..54bc6499f9cd 100644 --- a/arch/arm/configs/imx_v4_v5_defconfig +++ b/arch/arm/configs/imx_v4_v5_defconfig | |||
@@ -160,7 +160,6 @@ CONFIG_USB_CHIPIDEA_UDC=y | |||
160 | CONFIG_USB_CHIPIDEA_HOST=y | 160 | CONFIG_USB_CHIPIDEA_HOST=y |
161 | CONFIG_NOP_USB_XCEIV=y | 161 | CONFIG_NOP_USB_XCEIV=y |
162 | CONFIG_MMC=y | 162 | CONFIG_MMC=y |
163 | CONFIG_MMC_UNSAFE_RESUME=y | ||
164 | CONFIG_MMC_SDHCI=y | 163 | CONFIG_MMC_SDHCI=y |
165 | CONFIG_MMC_SDHCI_PLTFM=y | 164 | CONFIG_MMC_SDHCI_PLTFM=y |
166 | CONFIG_MMC_SDHCI_ESDHC_IMX=y | 165 | CONFIG_MMC_SDHCI_ESDHC_IMX=y |
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 6713a406b521..461a84045084 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig | |||
@@ -221,7 +221,6 @@ CONFIG_USB_GADGET=y | |||
221 | CONFIG_USB_ETH=m | 221 | CONFIG_USB_ETH=m |
222 | CONFIG_USB_MASS_STORAGE=m | 222 | CONFIG_USB_MASS_STORAGE=m |
223 | CONFIG_MMC=y | 223 | CONFIG_MMC=y |
224 | CONFIG_MMC_UNSAFE_RESUME=y | ||
225 | CONFIG_MMC_SDHCI=y | 224 | CONFIG_MMC_SDHCI=y |
226 | CONFIG_MMC_SDHCI_PLTFM=y | 225 | CONFIG_MMC_SDHCI_PLTFM=y |
227 | CONFIG_MMC_SDHCI_ESDHC_IMX=y | 226 | CONFIG_MMC_SDHCI_ESDHC_IMX=y |
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig index 40e87c412419..51702398557d 100644 --- a/arch/arm/configs/mxs_defconfig +++ b/arch/arm/configs/mxs_defconfig | |||
@@ -118,7 +118,6 @@ CONFIG_USB_GADGET=y | |||
118 | CONFIG_USB_ETH=m | 118 | CONFIG_USB_ETH=m |
119 | CONFIG_USB_MASS_STORAGE=m | 119 | CONFIG_USB_MASS_STORAGE=m |
120 | CONFIG_MMC=y | 120 | CONFIG_MMC=y |
121 | CONFIG_MMC_UNSAFE_RESUME=y | ||
122 | CONFIG_MMC_MXS=y | 121 | CONFIG_MMC_MXS=y |
123 | CONFIG_NEW_LEDS=y | 122 | CONFIG_NEW_LEDS=y |
124 | CONFIG_LEDS_CLASS=y | 123 | CONFIG_LEDS_CLASS=y |