diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-05-28 18:54:09 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-05-28 18:54:09 +0000 |
| commit | bc85c5aeaf04f3cc1fab6e20ccfeb22cc960f0cb (patch) | |
| tree | fb6178e1cf96f554b64ca2b6efc8b9b13880b346 | |
| parent | 13a73da7c8525b80b4f563419af0cbaa4dbb2405 (diff) | |
[rb532] refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16155 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/rb532/patches/001-cmdline_hack.patch | 4 | ||||
| -rw-r--r-- | target/linux/rb532/patches/002-rb532_nand_fixup.patch | 6 | ||||
| -rw-r--r-- | target/linux/rb532/patches/100-check_media.patch | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/rb532/patches/001-cmdline_hack.patch b/target/linux/rb532/patches/001-cmdline_hack.patch index b17734251..99c891dda 100644 --- a/target/linux/rb532/patches/001-cmdline_hack.patch +++ b/target/linux/rb532/patches/001-cmdline_hack.patch @@ -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++) = ' '; diff --git a/target/linux/rb532/patches/002-rb532_nand_fixup.patch b/target/linux/rb532/patches/002-rb532_nand_fixup.patch index 3c7cccacb..82c191295 100644 --- a/target/linux/rb532/patches/002-rb532_nand_fixup.patch +++ b/target/linux/rb532/patches/002-rb532_nand_fixup.patch @@ -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; diff --git a/target/linux/rb532/patches/100-check_media.patch b/target/linux/rb532/patches/100-check_media.patch index 4180c6237..66e731dac 100644 --- a/target/linux/rb532/patches/100-check_media.patch +++ b/target/linux/rb532/patches/100-check_media.patch @@ -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; } |