summaryrefslogtreecommitdiff
path: root/packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2006-02-11 12:21:46 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-02-11 12:21:46 +0000
commitada160dc6fb45bb99f851d241f060e369fa9b3a3 (patch)
tree940a66026b171ee17f293d930a30662ea81feab4 /packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch
parentfa3539b899bac502ce29f0cb073dbfd50f8a505f (diff)
disapproval of revision '20f5c236b9ebdf5e2fc0e5acea55f39e77588bb8'
Diffstat (limited to 'packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch')
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch11
1 files changed, 6 insertions, 5 deletions
diff --git a/packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch b/packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch
index b9c4c265d0..bc7bf2061a 100644
--- a/packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch
+++ b/packages/linux/ixp4xx-kernel/2.6.16/94-nas100d-setup.patch
@@ -4,11 +4,11 @@ in the boot loader.
Signed-off-by: John Bowler <jbowler@acm.org>
- arch/arm/mach-ixp4xx/nas100d-setup.c | 42 +++++++++++++++++++++++++++++++++++
- 1 file changed, 42 insertions(+)
+ arch/arm/mach-ixp4xx/nas100d-setup.c | 43 +++++++++++++++++++++++++++++++++++
+ 1 file changed, 43 insertions(+)
---- linux-nslu2.orig/arch/arm/mach-ixp4xx/nas100d-setup.c 2006-02-09 13:24:19.000000000 +0100
-+++ linux-nslu2/arch/arm/mach-ixp4xx/nas100d-setup.c 2006-02-09 15:13:56.000000000 +0100
+--- linux-nslu2.orig/arch/arm/mach-ixp4xx/nas100d-setup.c 2006-02-06 22:35:26.000000000 +0100
++++ linux-nslu2/arch/arm/mach-ixp4xx/nas100d-setup.c 2006-02-06 22:40:20.000000000 +0100
@@ -17,6 +17,8 @@
#include <linux/serial_8250.h>
#include <linux/mtd/mtd.h>
@@ -18,7 +18,7 @@ Signed-off-by: John Bowler <jbowler@acm.org>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/flash.h>
-@@ -161,11 +163,51 @@ static void __init nas100d_init(void)
+@@ -161,11 +163,52 @@ static void __init nas100d_init(void)
platform_add_devices(nas100d_devices, ARRAY_SIZE(nas100d_devices));
}
@@ -41,6 +41,7 @@ Signed-off-by: John Bowler <jbowler@acm.org>
+ */
+static char nas100d_command_line[] __initdata =
+ "root=/dev/mtdblock2 rootfstype=jffs2 init=/linuxrc "
++ "pcf8563.hctosys=1 "
+ CONFIG_CMDLINE;
+
+static void __init nas100d_fixup(struct machine_desc *desc,