summaryrefslogtreecommitdiff
path: root/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-poodle
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2005-12-05 16:47:28 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-12-05 16:47:28 +0000
commit562df0bb4d206422c0e403f5223cd0416f2fadbc (patch)
treeedcd4fc8a9d358d3e102706a77b2c49feeb2cd18 /packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-poodle
parentdbefa15b8674451b9db95022a904f4dc22901f8a (diff)
parent4ae600c96567dfe5b95f89e58e7c69466ff981ae (diff)
merge of 6217b7556df1e286940ec0d23fad92ab2f91eaa3
and 9b38a150f49864b478f6d3a1dcf6a63e6d7fa4e8
Diffstat (limited to 'packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-poodle')
-rw-r--r--packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-poodle1
1 files changed, 0 insertions, 1 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-poodle b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-poodle
index 34e9ddfb86..646e08305a 100644
--- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-poodle
+++ b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-poodle
@@ -157,7 +157,6 @@ CONFIG_PM=y
CONFIG_PREEMPT=y
CONFIG_APM=y
# CONFIG_ARTHUR is not set
-CONFIG_CMDLINE="console=tty0 console=ttyS0 noinitrd root=/dev/mtdblock1 rootfstype=jffs2 "
CONFIG_ALIGNMENT_TRAP=y
#