aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/rb532
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-02-04 14:35:38 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-02-04 14:35:38 +0000
commit6f4b03978147733a625c191b9734043bec5935e9 (patch)
treedc08cb6a1ef58014107a2738bf8318c5ff5bd5a0 /target/linux/rb532
parenta5dbcad4e9fadddbd202f8cf3695383e829de0ee (diff)
downloadupstream-6f4b03978147733a625c191b9734043bec5935e9.tar.gz
upstream-6f4b03978147733a625c191b9734043bec5935e9.tar.bz2
upstream-6f4b03978147733a625c191b9734043bec5935e9.zip
refresh 2.6.32 patches
SVN-Revision: 19522
Diffstat (limited to 'target/linux/rb532')
-rw-r--r--target/linux/rb532/patches-2.6.32/001-cmdline_hack.patch2
-rw-r--r--target/linux/rb532/patches-2.6.32/002-rb532_nand_fixup.patch6
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/rb532/patches-2.6.32/001-cmdline_hack.patch b/target/linux/rb532/patches-2.6.32/001-cmdline_hack.patch
index 246e502b77..82a324ccf7 100644
--- a/target/linux/rb532/patches-2.6.32/001-cmdline_hack.patch
+++ b/target/linux/rb532/patches-2.6.32/001-cmdline_hack.patch
@@ -7,7 +7,7 @@
+extern char __image_cmdline[];
void __init prom_setup_cmdline(void)
{
- char cmd_line[CL_SIZE];
+ static char cmd_line[CL_SIZE] __initdata;
@@ -109,6 +110,9 @@ void __init prom_setup_cmdline(void)
}
*(cp++) = ' ';
diff --git a/target/linux/rb532/patches-2.6.32/002-rb532_nand_fixup.patch b/target/linux/rb532/patches-2.6.32/002-rb532_nand_fixup.patch
index 82c191295f..0ba9fefb0f 100644
--- a/target/linux/rb532/patches-2.6.32/002-rb532_nand_fixup.patch
+++ b/target/linux/rb532/patches-2.6.32/002-rb532_nand_fixup.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
-@@ -140,6 +140,19 @@ static struct platform_device cf_slot0 =
+@@ -139,6 +139,19 @@ static struct platform_device cf_slot0 =
};
/* Resources and device for NAND */
@@ -20,7 +20,7 @@
static int rb532_dev_ready(struct mtd_info *mtd)
{
return gpio_get_value(GPIO_RDY);
-@@ -281,6 +294,16 @@ static void __init parse_mac_addr(char *
+@@ -280,6 +293,16 @@ static void __init parse_mac_addr(char *
/* NAND definitions */
#define NAND_CHIP_DELAY 25
@@ -37,7 +37,7 @@
static void __init rb532_nand_setup(void)
{
switch (mips_machtype) {
-@@ -300,6 +323,8 @@ static void __init rb532_nand_setup(void
+@@ -299,6 +322,8 @@ static void __init rb532_nand_setup(void
rb532_nand_data.chip.partitions = rb532_partition_info;
rb532_nand_data.chip.chip_delay = NAND_CHIP_DELAY;
rb532_nand_data.chip.options = NAND_NO_AUTOINCR;