summaryrefslogtreecommitdiffstats
path: root/config-armv7
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-05-03 08:27:34 -0400
committerJosh Boyer <jwboyer@redhat.com>2013-05-03 13:32:30 -0400
commitdeb816ab2a9e56c61f86b5fd641185ea2fd4fbc0 (patch)
treeb3c6f07375b0eedf0f6a790c4d678ba8a02b600e /config-armv7
parent94a5a8a2cbbfd22a31cb68d52661ad80ec9d2bb2 (diff)
downloadkernel-deb816ab2a9e56c61f86b5fd641185ea2fd4fbc0.tar.gz
kernel-deb816ab2a9e56c61f86b5fd641185ea2fd4fbc0.tar.xz
kernel-deb816ab2a9e56c61f86b5fd641185ea2fd4fbc0.zip
Linux v3.9-8933-gce85722
- First DRM merge
Diffstat (limited to 'config-armv7')
-rw-r--r--config-armv77
1 files changed, 6 insertions, 1 deletions
diff --git a/config-armv7 b/config-armv7
index 18230bb7e..f20645030 100644
--- a/config-armv7
+++ b/config-armv7
@@ -463,7 +463,12 @@ CONFIG_NVEC_PAZ00=y
CONFIG_PWM_TEGRA=m
-CONFIG_DRM_TEGRA=m
+CONFIG_TEGRA_HOST1X=m
+CONFIG_TEGRA_HOST1X_FIREWALL=y
+
+CONFIG_DRM_TEGRA=y
+# CONFIG_DRM_TEGRA_STAGING is not set
+# CONFIG_DRM_TEGRA_DEBUG is not set
CONFIG_CRYPTO_DEV_TEGRA_AES=m