summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/tegra_defconfig12
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index fbb76e523658..35fba16d6b6f 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.36.3
-# Mon Jan 24 15:36:52 2011
+# Thu Feb 3 15:55:53 2011
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -274,6 +274,12 @@ CONFIG_TEGRA_DEBUG_UARTD=y
CONFIG_TEGRA_SYSTEM_DMA=y
CONFIG_TEGRA_PWM=y
CONFIG_TEGRA_FIQ_DEBUGGER=y
+
+#
+# NVIDIA NVRM/NVOS options
+#
+# CONFIG_TEGRA_NVRM is not set
+# CONFIG_TEGRA_NVOS is not set
CONFIG_TEGRA_EMC_SCALING_ENABLE=y
CONFIG_TEGRA_CPU_DVFS=y
CONFIG_TEGRA_CORE_DVFS=y
@@ -1614,12 +1620,14 @@ CONFIG_FB_MODE_HELPERS=y
#
CONFIG_TEGRA_GRHOST=y
CONFIG_TEGRA_DC=y
+CONFIG_TEGRA_OVERLAY=y
CONFIG_FB_TEGRA=y
CONFIG_TEGRA_NVMAP=y
CONFIG_NVMAP_RECLAIM_UNPINNED_VM=y
CONFIG_NVMAP_ALLOW_SYSMEM=y
# CONFIG_NVMAP_HIGHMEM_ONLY is not set
# CONFIG_NVMAP_CARVEOUT_KILLER is not set
+# CONFIG_NVMAP_SEARCH_GLOBAL_HANDLES is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=y
# CONFIG_LCD_L4F00242T03 is not set
@@ -2446,7 +2454,7 @@ CONFIG_CRYPTO_MD5=y
# CONFIG_CRYPTO_RMD256 is not set
# CONFIG_CRYPTO_RMD320 is not set
CONFIG_CRYPTO_SHA1=y
-# CONFIG_CRYPTO_SHA256 is not set
+CONFIG_CRYPTO_SHA256=y
# CONFIG_CRYPTO_SHA512 is not set
# CONFIG_CRYPTO_TGR192 is not set
# CONFIG_CRYPTO_WP512 is not set