summaryrefslogtreecommitdiffstats
path: root/config-arm
diff options
context:
space:
mode:
authorKyle McMartin <kyle@dreadnought.i.jkkm.org>2010-08-04 12:18:36 -0400
committerKyle McMartin <kyle@dreadnought.i.jkkm.org>2010-08-04 12:18:36 -0400
commita10fa9029e0f97d76d720ab70b2ac8f93c94d502 (patch)
tree6477eabd718b41e3e6fa334719ccd3aa8dc5b11b /config-arm
parent17f0d73b219751760c86729c537b45168375f7a7 (diff)
downloadkernel-a10fa9029e0f97d76d720ab70b2ac8f93c94d502.tar.gz
kernel-a10fa9029e0f97d76d720ab70b2ac8f93c94d502.tar.xz
kernel-a10fa9029e0f97d76d720ab70b2ac8f93c94d502.zip
Actually branch 2.6.36 for rawhide
Diffstat (limited to 'config-arm')
-rw-r--r--config-arm7
1 files changed, 7 insertions, 0 deletions
diff --git a/config-arm b/config-arm
index 7b13a8279..d0ba0f376 100644
--- a/config-arm
+++ b/config-arm
@@ -113,3 +113,10 @@ CONFIG_PERF_COUNTERS=y
# CONFIG_MG_DISK is not set
# CONFIG_GPIO_PL061 is not set
+
+CONFIG_CC_STACKPROTECTOR=y
+
+CONFIG_AUTO_ZRELADDR=y
+
+# CONFIG_ARM_CHARLCD is not set
+# CONFIG_DEPRECATED_PARAM_STRUCT is not set