mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-26 02:38:59 +02:00
[au1000] refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13513 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
db8e4c03ca
commit
fd8f11bf77
@ -1,8 +1,8 @@
|
|||||||
--- a/arch/mips/au1000/mtx-1/init.c
|
--- a/arch/mips/au1000/mtx-1/init.c
|
||||||
+++ b/arch/mips/au1000/mtx-1/init.c
|
+++ b/arch/mips/au1000/mtx-1/init.c
|
||||||
@@ -54,7 +54,7 @@ void __init prom_init(void)
|
@@ -49,7 +49,7 @@ void __init prom_init(void)
|
||||||
prom_argv = (char **) fw_arg1;
|
prom_argv = (char **)fw_arg1;
|
||||||
prom_envp = (char **) fw_arg2;
|
prom_envp = (char **)fw_arg2;
|
||||||
|
|
||||||
- prom_init_cmdline();
|
- prom_init_cmdline();
|
||||||
+ strcpy(arcs_cmdline, CONFIG_CMDLINE);
|
+ strcpy(arcs_cmdline, CONFIG_CMDLINE);
|
||||||
|
@ -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
|
--- a/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
|
+++ b/arch/mips/au1000/mtx-1/platform.c
|
||||||
+++ 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 @@ static struct platform_device mtx1_gpio_
|
||||||
@@ -90,7 +90,7 @@
|
|
||||||
|
|
||||||
static struct mtd_partition mtx1_mtd_partitions[] = {
|
static struct mtd_partition mtx1_mtd_partitions[] = {
|
||||||
{
|
{
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/net/au1000_eth.c
|
--- a/drivers/net/au1000_eth.c
|
||||||
+++ b/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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- linux-2.6.27/drivers/net/au1000_eth.c 2008-10-18 22:37:52.000000000 +0200
|
--- a/drivers/net/au1000_eth.c
|
||||||
+++ linux-2.6.27.new/drivers/net/au1000_eth.c 2008-11-02 22:03:14.000000000 +0100
|
+++ b/drivers/net/au1000_eth.c
|
||||||
@@ -187,6 +187,15 @@
|
@@ -184,6 +184,15 @@ struct au1000_private *au_macs[NUM_ETH_I
|
||||||
# undef AU1XXX_PHY1_IRQ
|
# undef AU1XXX_PHY1_IRQ
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -16,7 +16,7 @@
|
|||||||
#if defined(AU1XXX_PHY0_BUSID) && (AU1XXX_PHY0_BUSID > 0)
|
#if defined(AU1XXX_PHY0_BUSID) && (AU1XXX_PHY0_BUSID > 0)
|
||||||
# error MAC0-associated PHY attached 2nd MACs MII bus not supported yet
|
# error MAC0-associated PHY attached 2nd MACs MII bus not supported yet
|
||||||
#endif
|
#endif
|
||||||
@@ -383,6 +392,12 @@
|
@@ -380,6 +389,12 @@ static int mii_probe (struct net_device
|
||||||
aup->old_duplex = -1;
|
aup->old_duplex = -1;
|
||||||
aup->phy_dev = phydev;
|
aup->phy_dev = phydev;
|
||||||
|
|
||||||
|
@ -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
|
--- a/drivers/watchdog/mtx-1_wdt.c
|
||||||
+++ b/drivers/watchdog/mtx-1_wdt.c
|
+++ b/drivers/watchdog/mtx-1_wdt.c
|
||||||
@@ -98,6 +98,8 @@ static void mtx1_wdt_reset(void)
|
@@ -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);
|
spin_lock_irqsave(&mtx1_wdt_device.lock, flags);
|
||||||
if (mtx1_wdt_device.queue) {
|
if (mtx1_wdt_device.queue) {
|
||||||
mtx1_wdt_device.queue = 0;
|
mtx1_wdt_device.queue = 0;
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
--- linux-2.6.27.5/arch/mips/au1000/mtx-1/init.c 2008-11-07 18:55:34.000000000 +0100
|
--- a/arch/mips/au1000/mtx-1/init.c
|
||||||
+++ linux-2.6.27.5.new/arch/mips/au1000/mtx-1/init.c 2008-11-15 16:09:47.000000000 +0100
|
+++ b/arch/mips/au1000/mtx-1/init.c
|
||||||
@@ -32,6 +32,7 @@
|
@@ -32,6 +32,7 @@
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user