summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@nvidia.com>2011-05-11 16:30:39 -0700
committerNiket Sirsi <nsirsi@nvidia.com>2011-05-12 21:07:02 -0700
commit0edac603fc410d7b6686b27e545586b42feb7a80 (patch)
treea5be3d06f5f7a994e9fbb91d45c6db54e43bd201 /arch
parentc8bde2d8332d313b04856377cb95ccd555051a0e (diff)
ARM: config: tegra: Update SecureOS config
Merge updates from tegra_defconfig Change-Id: I45a488f27c516a0f892eb394771302c68cd2aa6c Reviewed-on: http://git-master/r/31257 Tested-by: Daniel Willemsen <dwillemsen@nvidia.com> Reviewed-by: Andrei Denissov <adenissov@nvidia.com> Reviewed-by: Jonathan B White (Engrg-Mobile) <jwhite@nvidia.com> Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/tegra_secure_os_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/tegra_secure_os_defconfig b/arch/arm/configs/tegra_secure_os_defconfig
index cabbf6a6faa5..4c3b59e80fa9 100644
--- a/arch/arm/configs/tegra_secure_os_defconfig
+++ b/arch/arm/configs/tegra_secure_os_defconfig
@@ -255,6 +255,7 @@ CONFIG_VIDEO_DEV=y
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
CONFIG_VIDEO_OV5650=y
CONFIG_VIDEO_OV2710=y
+CONFIG_TORCH_SSL3250A=y
CONFIG_VIDEO_SH532U=y
CONFIG_USB_VIDEO_CLASS=y
# CONFIG_USB_GSPCA is not set
@@ -262,6 +263,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
CONFIG_FB=y
CONFIG_TEGRA_GRHOST=y
CONFIG_TEGRA_DC=y
+CONFIG_TEGRA_DSI=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y