From 2b9be5e324beee66740c311c67c660f544b8497d Mon Sep 17 00:00:00 2001 From: John Bowler Date: Mon, 16 Jan 2006 10:13:55 +0000 Subject: ixp4xx-kernel: fix boot setup parameters in 2.6.15 - there is now a default machine-specific command line and an override for the memory config to provide a useable default per-machine. --- conf/machine/nas100d.conf | 3 --- 1 file changed, 3 deletions(-) (limited to 'conf/machine') diff --git a/conf/machine/nas100d.conf b/conf/machine/nas100d.conf index 41836c3272..29a3b04f5f 100644 --- a/conf/machine/nas100d.conf +++ b/conf/machine/nas100d.conf @@ -3,6 +3,3 @@ #@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" -- cgit v1.2.3