refresh patches

SVN-Revision: 13513
This commit is contained in:
Gabor Juhos 2008-12-04 14:48:54 +00:00
parent 8107050ef9
commit 6cd800ed2f
6 changed files with 13 additions and 17 deletions

View File

@ -1,8 +1,8 @@
--- a/arch/mips/au1000/mtx-1/init.c
+++ b/arch/mips/au1000/mtx-1/init.c
@@ -54,7 +54,7 @@ void __init prom_init(void)
prom_argv = (char **) fw_arg1;
prom_envp = (char **) fw_arg2;
@@ -49,7 +49,7 @@ void __init prom_init(void)
prom_argv = (char **)fw_arg1;
prom_envp = (char **)fw_arg2;
- prom_init_cmdline();
+ strcpy(arcs_cmdline, CONFIG_CMDLINE);

View File

@ -1,7 +1,6 @@
diff -urN linux-2.6.27.5/arch/mips/au1000/mtx-1/platform.c linux-2.6.27.5.new/arch/mips/au1000/mtx-1/platform.c
--- linux-2.6.27.5/arch/mips/au1000/mtx-1/platform.c 2008-11-07 18:55:34.000000000 +0100
+++ linux-2.6.27.5.new/arch/mips/au1000/mtx-1/platform.c 2008-11-15 15:33:31.000000000 +0100
@@ -90,7 +90,7 @@
--- a/arch/mips/au1000/mtx-1/platform.c
+++ b/arch/mips/au1000/mtx-1/platform.c
@@ -90,7 +90,7 @@ static struct platform_device mtx1_gpio_
static struct mtd_partition mtx1_mtd_partitions[] = {
{

View File

@ -1,6 +1,6 @@
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -1306,9 +1306,12 @@ static void set_rx_mode(struct net_devic
@@ -1293,9 +1293,12 @@ static void set_rx_mode(struct net_devic
}
}

View File

@ -1,6 +1,6 @@
--- linux-2.6.27/drivers/net/au1000_eth.c 2008-10-18 22:37:52.000000000 +0200
+++ linux-2.6.27.new/drivers/net/au1000_eth.c 2008-11-02 22:03:14.000000000 +0100
@@ -187,6 +187,15 @@
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -184,6 +184,15 @@ struct au1000_private *au_macs[NUM_ETH_I
# undef AU1XXX_PHY1_IRQ
#endif
@ -16,7 +16,7 @@
#if defined(AU1XXX_PHY0_BUSID) && (AU1XXX_PHY0_BUSID > 0)
# error MAC0-associated PHY attached 2nd MACs MII bus not supported yet
#endif
@@ -383,6 +392,12 @@
@@ -380,6 +389,12 @@ static int mii_probe (struct net_device
aup->old_duplex = -1;
aup->phy_dev = phydev;

View File

@ -1,5 +1,3 @@
diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
index b4b7b0a..3acce62 100644
--- a/drivers/watchdog/mtx-1_wdt.c
+++ b/drivers/watchdog/mtx-1_wdt.c
@@ -98,6 +98,8 @@ static void mtx1_wdt_reset(void)
@ -20,4 +18,3 @@ index b4b7b0a..3acce62 100644
spin_lock_irqsave(&mtx1_wdt_device.lock, flags);
if (mtx1_wdt_device.queue) {
mtx1_wdt_device.queue = 0;

View File

@ -1,5 +1,5 @@
--- linux-2.6.27.5/arch/mips/au1000/mtx-1/init.c 2008-11-07 18:55:34.000000000 +0100
+++ linux-2.6.27.5.new/arch/mips/au1000/mtx-1/init.c 2008-11-15 16:09:47.000000000 +0100
--- a/arch/mips/au1000/mtx-1/init.c
+++ b/arch/mips/au1000/mtx-1/init.c
@@ -32,6 +32,7 @@
#include <linux/init.h>