From: John Bowler <jbowler@nslu2-linux.org>
Date: Mon, 16 Jan 2006 01:34:11 +0000 (+0000)
Subject: ixp4xx-kernel: unbreak nas100d build in 2.6.15
X-Git-Tag: Release-2010-05/1~9453^2~2650^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18c9101466353560610d720e168bc7488613a91b;p=openembedded.git

ixp4xx-kernel: unbreak nas100d build in 2.6.15
 - temporarily put the CMDLINE_ROOT back in to the conf file so that
   nas100d kernels keep on working
---

diff --git a/conf/machine/nas100d.conf b/conf/machine/nas100d.conf
index 29a3b04f5f..41836c3272 100644
--- a/conf/machine/nas100d.conf
+++ b/conf/machine/nas100d.conf
@@ -3,3 +3,6 @@
 #@DESCRIPTION: Machine configuration for the Iomega NAS 100d product
 
 include conf/machine/include/ixp4xx.conf
+
+# TEMPORARY: fixup the command line for nas100d builds
+CMDLINE_ROOT = "root=/dev/mtdblock2 rw rootfstype=jffs2 mem=64M@0x00000000 init=/linuxrc"