diff options
| author | Gary King <gking@nvidia.com> | 2010-05-28 11:19:46 -0700 |
|---|---|---|
| committer | Gary King <gking@nvidia.com> | 2010-05-28 11:26:39 -0700 |
| commit | 71a7dadda9fdd9e6292c7ab4f4037776d9e107e1 (patch) | |
| tree | 08bd3813d8ca03bea03a23e8f8ac5b6d3b4c4127 | |
| parent | 8081341e6b02ac5e52bc6859db92aa1495f67161 (diff) | |
[ARM] harmony: update harmony to match Kconfig machine cleanup
Change-Id: I2622d6f614f69dadeb285128f79cfceaa396c688
Reviewed-on: http://git-master/r/1809
Reviewed-by: Gary King <gking@nvidia.com>
Tested-by: Gary King <gking@nvidia.com>
| -rw-r--r-- | arch/arm/configs/tegra_harmony_android_defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/configs/tegra_harmony_android_defconfig b/arch/arm/configs/tegra_harmony_android_defconfig index 129966ce65d6..c290142b90f0 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 -# Thu May 27 22:24:26 2010 +# Fri May 28 10:41:16 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -207,14 +207,14 @@ CONFIG_ARCH_TEGRA=y # NVIDIA Tegra options # CONFIG_ARCH_TEGRA_2x_SOC=y -CONFIG_MACH_HARMONY=y +CONFIG_MACH_TEGRA_GENERIC=y +CONFIG_TEGRA_ODM_KIT=y CONFIG_TEGRA_DEBUG_UART_NONE=y # CONFIG_TEGRA_DEBUG_UARTA is not set # CONFIG_TEGRA_DEBUG_UARTB is not set # CONFIG_TEGRA_DEBUG_UARTC is not set # CONFIG_TEGRA_DEBUG_UARTD is not set # CONFIG_TEGRA_DEBUG_UARTE is not set -CONFIG_MACH_TEGRA_GENERIC=y CONFIG_TEGRA_NVOS=y CONFIG_TEGRA_NVRM=y CONFIG_TEGRA_IOVMM_GART=y |