summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary King <gking@nvidia.com>2010-06-07 12:32:31 -0700
committerGary King <gking@nvidia.com>2010-06-07 12:36:29 -0700
commitf056d21449d029c7b0da6f8c78f9d5f033770a15 (patch)
tree911a7bfbb20ba2be44c272020952fecc3d45bbad
parent4dcd7a1c7fc8a02c93f9bdf954dda9eab6cad44f (diff)
[ARM] harmony/whistler: enable TEGRA_AES and TEGRA_AES_USER
Change-Id: I573c74b7982020b5b282a276aa1cdc6171162c73 Reviewed-on: http://git-master/r/2217 Reviewed-by: Gary King <gking@nvidia.com> Tested-by: Gary King <gking@nvidia.com>
-rw-r--r--arch/arm/configs/tegra_harmony_android_defconfig4
-rw-r--r--arch/arm/configs/tegra_whistler_android_defconfig4
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/configs/tegra_harmony_android_defconfig b/arch/arm/configs/tegra_harmony_android_defconfig
index 4cf361c547ba..c18d7ccc0906 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
-# Fri May 28 17:14:59 2010
+# Mon Jun 7 09:58:09 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -223,6 +223,8 @@ CONFIG_TEGRA_IOVMM=y
CONFIG_TEGRA_NVEC=y
CONFIG_TEGRA_PCI=y
CONFIG_TEGRA_FUSE=y
+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_ODM_HARMONY=y
diff --git a/arch/arm/configs/tegra_whistler_android_defconfig b/arch/arm/configs/tegra_whistler_android_defconfig
index 4ef90e856a31..19e0804b43d8 100644
--- a/arch/arm/configs/tegra_whistler_android_defconfig
+++ b/arch/arm/configs/tegra_whistler_android_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32.9
-# Fri May 28 17:14:04 2010
+# Mon Jun 7 12:29:35 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -222,6 +222,8 @@ CONFIG_TEGRA_IOVMM=y
# CONFIG_TEGRA_NVEC is not set
# CONFIG_TEGRA_PCI is not set
CONFIG_TEGRA_FUSE=y
+CONFIG_TEGRA_AES=y
+CONFIG_TEGRA_AES_USER=y
CONFIG_TEGRA_USB_CHARGE=y
CONFIG_TEGRA_ODM_VIBRATE=y
# CONFIG_TEGRA_ODM_HARMONY is not set