diff options
| author | Deepesh Gujarathi <dgujarathi@nvidia.com> | 2010-06-18 16:42:38 +0530 |
|---|---|---|
| committer | Gary King <gking@nvidia.com> | 2010-06-18 10:04:59 -0700 |
| commit | 9d6667430476b6dee458bb269958979ceee992e9 (patch) | |
| tree | 84aacfd71fd1466c31883417b321f612cb0151a5 /arch/arm | |
| parent | 8d51d6c4289ca1af7eb210e17a849f7473b4d51a (diff) | |
[ARM] harmony: enable MMC_UNSAFE_RESUME
bug 700135
Change-Id: I8f81011285f62e09b05449e6c3247eca4b306898
Reviewed-on: http://git-master/r/2879
Reviewed-by: Gary King <gking@nvidia.com>
Tested-by: Gary King <gking@nvidia.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/tegra_harmony_android_defconfig | 5 | ||||
| -rw-r--r-- | arch/arm/configs/tegra_harmony_gnu_linux_defconfig | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/configs/tegra_harmony_android_defconfig b/arch/arm/configs/tegra_harmony_android_defconfig index 02ba4055849c..6d8e0887daee 100644 --- a/arch/arm/configs/tegra_harmony_android_defconfig +++ b/arch/arm/configs/tegra_harmony_android_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.9 -# Wed Jun 16 11:31:45 2010 +# Fri Jun 18 15:29:24 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -227,6 +227,7 @@ CONFIG_TEGRA_AES=y CONFIG_TEGRA_AES_USER=y # CONFIG_TEGRA_USB_CHARGE is not set # CONFIG_TEGRA_ODM_VIBRATE is not set +# CONFIG_TEGRA_USB_VBUS_DETECT_BY_PMU is not set CONFIG_TEGRA_ODM_HARMONY=y # CONFIG_TEGRA_ODM_WHISTLER is not set @@ -1564,7 +1565,7 @@ CONFIG_USB_TEGRA_OTG=y CONFIG_MMC=y # CONFIG_EMBEDDED_MMC_START_OFFSET is not set # CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_UNSAFE_RESUME is not set +CONFIG_MMC_UNSAFE_RESUME=y # CONFIG_MMC_EMBEDDED_SDIO is not set # CONFIG_MMC_PARANOID_SD_INIT is not set diff --git a/arch/arm/configs/tegra_harmony_gnu_linux_defconfig b/arch/arm/configs/tegra_harmony_gnu_linux_defconfig index fe23d821e1d2..3032434d6a49 100644 --- a/arch/arm/configs/tegra_harmony_gnu_linux_defconfig +++ b/arch/arm/configs/tegra_harmony_gnu_linux_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.9 -# Tue Jun 15 10:55:27 2010 +# Fri Jun 18 19:28:17 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -226,6 +226,7 @@ CONFIG_TEGRA_PCI=y CONFIG_TEGRA_FUSE=y # CONFIG_TEGRA_AES is not set # CONFIG_TEGRA_USB_CHARGE is not set +# CONFIG_TEGRA_USB_VBUS_DETECT_BY_PMU is not set CONFIG_TEGRA_ODM_HARMONY=y # CONFIG_TEGRA_ODM_WHISTLER is not set @@ -1478,7 +1479,7 @@ CONFIG_USB_TEGRA_OTG=y CONFIG_MMC=y # CONFIG_EMBEDDED_MMC_START_OFFSET is not set # CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_UNSAFE_RESUME is not set +CONFIG_MMC_UNSAFE_RESUME=y # CONFIG_MMC_EMBEDDED_SDIO is not set # CONFIG_MMC_PARANOID_SD_INIT is not set |