summaryrefslogtreecommitdiff
path: root/target/wrap/kernel.config
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-02-28 12:36:30 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-02-28 12:36:30 +0100
commita21751d05ee06fd4e0bfae705e8467922b344120 (patch)
tree7705f057fee1baf2152bf2b97c9c4217298f4f06 /target/wrap/kernel.config
parentd8a9ea4f5591783df24634cfaf10f32307b58803 (diff)
parent1b7510f011b5c63c060943716f39c9417b116359 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/wrap/kernel.config')
-rw-r--r--target/wrap/kernel.config4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/wrap/kernel.config b/target/wrap/kernel.config
index 0cdebff81..89381d497 100644
--- a/target/wrap/kernel.config
+++ b/target/wrap/kernel.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.33
-# Sat Feb 27 12:12:13 2010
+# Sat Feb 27 12:32:01 2010
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -790,7 +790,7 @@ CONFIG_WATCHDOG=y
# CONFIG_IT8712F_WDT is not set
# CONFIG_IT87_WDT is not set
# CONFIG_HP_WATCHDOG is not set
-CONFIG_SC1200_WDT=y
+# CONFIG_SC1200_WDT is not set
CONFIG_SCx200_WDT=y
# CONFIG_PC87413_WDT is not set
# CONFIG_60XX_WDT is not set