summaryrefslogtreecommitdiffstats
path: root/config-arm
diff options
context:
space:
mode:
authorKyle McMartin <kyle@dreadnought.i.jkkm.org>2010-08-17 16:06:35 -0400
committerKyle McMartin <kyle@dreadnought.i.jkkm.org>2010-08-17 16:07:07 -0400
commitda80d72ecea221386e6642122ab332f2aaa457ce (patch)
treec3641cd7e7701ae4646367c395e8569aeafb5d35 /config-arm
parentc7a89c25e0dbac3f4d1e2f40ae910f71ebd224b6 (diff)
downloadkernel-da80d72ecea221386e6642122ab332f2aaa457ce.tar.gz
kernel-da80d72ecea221386e6642122ab332f2aaa457ce.tar.xz
kernel-da80d72ecea221386e6642122ab332f2aaa457ce.zip
First pass at 2.6.36-rc1
Diffstat (limited to 'config-arm')
-rw-r--r--config-arm2
1 files changed, 2 insertions, 0 deletions
diff --git a/config-arm b/config-arm
index d0ba0f376..8d7e46a49 100644
--- a/config-arm
+++ b/config-arm
@@ -120,3 +120,5 @@ CONFIG_AUTO_ZRELADDR=y
# CONFIG_ARM_CHARLCD is not set
# CONFIG_DEPRECATED_PARAM_STRUCT is not set
+
+# CONFIG_ARM_SP805_WATCHDOG is not set