summaryrefslogtreecommitdiff
path: root/target/qemu-cris/kernel.config
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-08-23 21:43:50 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-08-23 21:43:50 +0200
commitdf0420a62dde5030d0cf8c28c26031f5deb59155 (patch)
tree8395fcf057779660f3e0fb5f4f4c16637386b69a /target/qemu-cris/kernel.config
parent2b198ddc02b3231e43ab8fdddef76ff103a0f5a4 (diff)
parent5774bab43a1946acd8440ad759eb6cc26335e64c (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/qemu-cris/kernel.config')
-rw-r--r--target/qemu-cris/kernel.config2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/qemu-cris/kernel.config b/target/qemu-cris/kernel.config
index 3bae4c94b..07e09d533 100644
--- a/target/qemu-cris/kernel.config
+++ b/target/qemu-cris/kernel.config
@@ -110,7 +110,7 @@ CONFIG_BINFMT_ELF=y
# CONFIG_HAVE_AOUT is not set
# CONFIG_BINFMT_MISC is not set
CONFIG_GENERIC_HARDIRQS=y
-CONFIG_ETRAX_CMDLINE="console=ttyS0,115200 init=/init"
+CONFIG_ETRAX_CMDLINE="console=ttyS0,115200"
# CONFIG_ETRAX_WATCHDOG is not set
CONFIG_ETRAX_FAST_TIMER=y
# CONFIG_ETRAX_KMALLOCED_MODULES is not set