diff options
| -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 |