refresh 2.6.32 patches

SVN-Revision: 19522
This commit is contained in:
Florian Fainelli 2010-02-04 14:35:38 +00:00
parent a5dbcad4e9
commit 6f4b039781
2 changed files with 4 additions and 4 deletions

View file

@ -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++) = ' ';

View file

@ -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;