diff options
| author | Matteo Croce <rootkit85@yahoo.it> | 2008-06-12 22:33:48 +0000 |
|---|---|---|
| committer | Matteo Croce <rootkit85@yahoo.it> | 2008-06-12 22:33:48 +0000 |
| commit | d1c097e3d033d1f8545d8a9b5ae82a224434a475 (patch) | |
| tree | 3af6b947e2feaedcc7416dd5f5df01d485cc099e /target/linux/ar7/patches-2.6.25/150-cpmac_up_and_running.diff | |
| parent | e8a8d5811d8e3716a0f66769242ab564c4d00d14 (diff) | |
| download | upstream-d1c097e3d033d1f8545d8a9b5ae82a224434a475.tar.gz upstream-d1c097e3d033d1f8545d8a9b5ae82a224434a475.tar.bz2 upstream-d1c097e3d033d1f8545d8a9b5ae82a224434a475.zip | |
ar7: refresh patches
SVN-Revision: 11452
Diffstat (limited to 'target/linux/ar7/patches-2.6.25/150-cpmac_up_and_running.diff')
| -rw-r--r-- | target/linux/ar7/patches-2.6.25/150-cpmac_up_and_running.diff | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/target/linux/ar7/patches-2.6.25/150-cpmac_up_and_running.diff b/target/linux/ar7/patches-2.6.25/150-cpmac_up_and_running.diff index 444ab56e78..f0f153bf33 100644 --- a/target/linux/ar7/patches-2.6.25/150-cpmac_up_and_running.diff +++ b/target/linux/ar7/patches-2.6.25/150-cpmac_up_and_running.diff @@ -13,10 +13,8 @@ Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> drivers/net/cpmac.c | 19 +++---------------- 2 files changed, 20 insertions(+), 16 deletions(-) -Index: linux-2.6.25.4/arch/mips/ar7/platform.c -=================================================================== ---- linux-2.6.25.4.orig/arch/mips/ar7/platform.c -+++ linux-2.6.25.4/arch/mips/ar7/platform.c +--- a/arch/mips/ar7/platform.c ++++ b/arch/mips/ar7/platform.c @@ -33,6 +33,8 @@ #include <linux/vlynq.h> #include <linux/leds.h> @@ -26,7 +24,7 @@ Index: linux-2.6.25.4/arch/mips/ar7/platform.c #include <asm/addrspace.h> #include <asm/ar7/ar7.h> -@@ -205,6 +207,13 @@ static struct physmap_flash_data physmap +@@ -205,6 +207,13 @@ .width = 2, }; @@ -40,7 +38,7 @@ Index: linux-2.6.25.4/arch/mips/ar7/platform.c static struct plat_cpmac_data cpmac_low_data = { .reset_bit = 17, .power_bit = 20, -@@ -506,6 +515,10 @@ static int __init ar7_register_devices(v +@@ -506,6 +515,10 @@ } if (ar7_has_high_cpmac()) { @@ -51,7 +49,7 @@ Index: linux-2.6.25.4/arch/mips/ar7/platform.c cpmac_get_mac(1, cpmac_high_data.dev_addr); res = platform_device_register(&cpmac_high); if (res) -@@ -514,6 +527,10 @@ static int __init ar7_register_devices(v +@@ -514,6 +527,10 @@ cpmac_low_data.phy_mask = 0xffffffff; } @@ -62,11 +60,9 @@ Index: linux-2.6.25.4/arch/mips/ar7/platform.c cpmac_get_mac(0, cpmac_low_data.dev_addr); res = platform_device_register(&cpmac_low); if (res) -Index: linux-2.6.25.4/drivers/net/cpmac.c -=================================================================== ---- linux-2.6.25.4.orig/drivers/net/cpmac.c -+++ linux-2.6.25.4/drivers/net/cpmac.c -@@ -1035,23 +1035,10 @@ static int __devinit cpmac_probe(struct +--- a/drivers/net/cpmac.c ++++ b/drivers/net/cpmac.c +@@ -1035,23 +1035,10 @@ if (phy_id == PHY_MAX_ADDR) { if (external_switch || dumb_switch) { |