From 2b43286d28e27254cbd9ee60f17054633627aae3 Mon Sep 17 00:00:00 2001 From: juhosg Date: Mon, 19 May 2008 07:06:35 +0000 Subject: [ar7] refresh kernel patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11196 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../ar7/patches-2.6.25/150-cpmac_up_and_running.diff | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'target/linux/ar7/patches-2.6.25/150-cpmac_up_and_running.diff') 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 9b15772c4..444ab56e7 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,10 @@ Signed-off-by: Anton Vorontsov drivers/net/cpmac.c | 19 +++---------------- 2 files changed, 20 insertions(+), 16 deletions(-) -Index: linux-2.6.25.1/arch/mips/ar7/platform.c +Index: linux-2.6.25.4/arch/mips/ar7/platform.c =================================================================== ---- linux-2.6.25.1.orig/arch/mips/ar7/platform.c 2008-05-03 16:17:30.000000000 +0200 -+++ linux-2.6.25.1/arch/mips/ar7/platform.c 2008-05-03 16:24:08.000000000 +0200 +--- linux-2.6.25.4.orig/arch/mips/ar7/platform.c ++++ linux-2.6.25.4/arch/mips/ar7/platform.c @@ -33,6 +33,8 @@ #include #include @@ -26,7 +26,7 @@ Index: linux-2.6.25.1/arch/mips/ar7/platform.c #include #include -@@ -205,6 +207,13 @@ +@@ -205,6 +207,13 @@ static struct physmap_flash_data physmap .width = 2, }; @@ -40,7 +40,7 @@ Index: linux-2.6.25.1/arch/mips/ar7/platform.c static struct plat_cpmac_data cpmac_low_data = { .reset_bit = 17, .power_bit = 20, -@@ -506,6 +515,10 @@ +@@ -506,6 +515,10 @@ static int __init ar7_register_devices(v } if (ar7_has_high_cpmac()) { @@ -51,7 +51,7 @@ Index: linux-2.6.25.1/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 @@ +@@ -514,6 +527,10 @@ static int __init ar7_register_devices(v cpmac_low_data.phy_mask = 0xffffffff; } @@ -62,11 +62,11 @@ Index: linux-2.6.25.1/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.1/drivers/net/cpmac.c +Index: linux-2.6.25.4/drivers/net/cpmac.c =================================================================== ---- linux-2.6.25.1.orig/drivers/net/cpmac.c 2008-05-03 16:21:17.000000000 +0200 -+++ linux-2.6.25.1/drivers/net/cpmac.c 2008-05-03 16:24:08.000000000 +0200 -@@ -1035,23 +1035,10 @@ +--- 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 if (phy_id == PHY_MAX_ADDR) { if (external_switch || dumb_switch) { -- cgit v1.2.3