aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-09-10 13:35:47 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-09-10 13:35:47 +0000
commita67e369c117fc1ec0c66a0d9ac7c2815c64fa9ce (patch)
treea5021b3ac0ea3273a134afdaa4a29055cefb36c4
parentfd376111a230312a7f2c5d914f8352bbe171b763 (diff)
downloadupstream-a67e369c117fc1ec0c66a0d9ac7c2815c64fa9ce.tar.gz
upstream-a67e369c117fc1ec0c66a0d9ac7c2815c64fa9ce.tar.bz2
upstream-a67e369c117fc1ec0c66a0d9ac7c2815c64fa9ce.zip
kernel: refresh 2.6.30 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17557 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/840-unable_to_open_console.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/999-use_preinit_as_init.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/840-unable_to_open_console.patch b/target/linux/generic-2.6/patches-2.6.30/840-unable_to_open_console.patch
index eb6bd8c2b7..c9a2774689 100644
--- a/target/linux/generic-2.6/patches-2.6.30/840-unable_to_open_console.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/840-unable_to_open_console.patch
@@ -1,6 +1,6 @@
--- a/init/main.c
+++ b/init/main.c
-@@ -811,7 +811,7 @@ static noinline int init_post(void)
+@@ -812,7 +812,7 @@ static noinline int init_post(void)
numa_default_policy();
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
diff --git a/target/linux/generic-2.6/patches-2.6.30/999-use_preinit_as_init.patch b/target/linux/generic-2.6/patches-2.6.30/999-use_preinit_as_init.patch
index 631da6d768..0a52a87e83 100644
--- a/target/linux/generic-2.6/patches-2.6.30/999-use_preinit_as_init.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/999-use_preinit_as_init.patch
@@ -1,6 +1,6 @@
--- a/init/main.c
+++ b/init/main.c
-@@ -835,10 +835,7 @@ static noinline int init_post(void)
+@@ -836,10 +836,7 @@ static noinline int init_post(void)
printk(KERN_WARNING "Failed to execute %s. Attempting "
"defaults...\n", execute_command);
}