refresh patches

SVN-Revision: 16155
v19.07.3_mercusys_ac12_duma
Florian Fainelli 15 years ago
parent 463a6f4bda
commit e0c3e283da

@ -14,7 +14,7 @@
* Reserved space for exception handlers.
--- a/arch/mips/rb532/prom.c
+++ b/arch/mips/rb532/prom.c
@@ -67,6 +67,7 @@
@@ -67,6 +67,7 @@ static inline unsigned long tag2ul(char
return simple_strtoul(num, 0, 10);
}
@ -22,7 +22,7 @@
void __init prom_setup_cmdline(void)
{
char cmd_line[CL_SIZE];
@@ -109,6 +110,9 @@
@@ -109,6 +110,9 @@ void __init prom_setup_cmdline(void)
}
*(cp++) = ' ';

@ -1,6 +1,6 @@
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
@@ -119,6 +119,19 @@ static struct platform_device cf_slot0 =
@@ -140,6 +140,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);
@@ -277,6 +290,16 @@ static void __init parse_mac_addr(char *
@@ -281,6 +294,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) {
@@ -296,6 +319,8 @@ static void __init rb532_nand_setup(void
@@ -300,6 +323,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;

@ -8,7 +8,7 @@
struct mii_if_info mii_if;
struct net_device *dev;
int phy_addr;
@@ -663,6 +664,15 @@ static void korina_check_media(struct ne
@@ -664,6 +665,15 @@ static void korina_check_media(struct ne
&lp->eth_regs->ethmac2);
}
@ -41,7 +41,7 @@
/* Disable interrupts */
disable_irq(lp->rx_irq);
disable_irq(lp->tx_irq);
@@ -1177,6 +1190,7 @@ static int korina_probe(struct platform_
@@ -1176,6 +1189,7 @@ static int korina_probe(struct platform_
": cannot register net device %d\n", rc);
goto probe_err_register;
}

Loading…
Cancel
Save