summaryrefslogtreecommitdiff
path: root/target/linux
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-01-31 15:32:10 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-01-31 15:32:10 +0100
commit69f8e5c7f61a46b79a3a75036d8cfe86830023c1 (patch)
treea58988b85efb6635d7fbd0c5afaa62beae8b22bc /target/linux
parent0551a2054198f2d8041bba5e10ff000905ee6a70 (diff)
parent480d62de9c308ee91711a980cd9d51e3e2806cef (diff)
Merge branch 'master' of git+ssh://wbx@openadk.org/git/openadk
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/patches/2.6.32/startup.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/patches/2.6.32/startup.patch b/target/linux/patches/2.6.32/startup.patch
index 25302f8d9..1e50e6312 100644
--- a/target/linux/patches/2.6.32/startup.patch
+++ b/target/linux/patches/2.6.32/startup.patch
@@ -1,16 +1,16 @@
-diff -Nur linux-2.6.30.5.orig/init/main.c linux-2.6.30.5/init/main.c
---- linux-2.6.30.5.orig/init/main.c 2009-08-16 23:19:38.000000000 +0200
-+++ linux-2.6.30.5/init/main.c 2009-08-22 20:26:39.000000000 +0200
-@@ -811,7 +811,7 @@
- numa_default_policy();
-
+diff -Nur linux-2.6.32.orig/init/main.c linux-2.6.32/init/main.c
+--- linux-2.6.32.orig/init/main.c 2009-12-03 04:51:21.000000000 +0100
++++ linux-2.6.32/init/main.c 2010-01-31 11:01:41.154334301 +0100
+@@ -814,6 +814,8 @@
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
-- printk(KERN_WARNING "Warning: unable to open an initial console.\n");
-+ printk(KERN_WARNING "Starting Linux (build with OpenADK).\n");
+ printk(KERN_WARNING "Warning: unable to open an initial console.\n");
++ printk(KERN_WARNING "Starting Linux (build with OpenADK).\n");
++
(void) sys_dup(0);
(void) sys_dup(0);
-@@ -835,6 +835,7 @@
+
+@@ -836,6 +838,7 @@
printk(KERN_WARNING "Failed to execute %s. Attempting "
"defaults...\n", execute_command);
}