diff options
| author | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-30 16:32:35 +0000 |
|---|---|---|
| committer | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-30 16:32:35 +0000 |
| commit | 30d336cfc5e67d66ed19a84223a9215f42c30135 (patch) | |
| tree | a44f1bdee35d9e09d2e6e49a8f3109228aa2a7cf /target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch | |
| parent | 48983d35d70395a391026c8f8bb1f44165ce058e (diff) | |
refresh ixp4xx patches to match upstream style
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11297 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch b/target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch index 792acc0f3..ece08fd17 100644 --- a/target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch +++ b/target/linux/ixp4xx/patches-2.6.25/303-avila_gw23x7_phy_quirk.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c -=================================================================== ---- linux-2.6.25.4.orig/arch/arm/mach-ixp4xx/avila-setup.c -+++ linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c -@@ -294,6 +294,7 @@ static void __init avila_gw2345_setup(vo +--- a/arch/arm/mach-ixp4xx/avila-setup.c ++++ b/arch/arm/mach-ixp4xx/avila-setup.c +@@ -294,6 +294,7 @@ static void __init avila_gw2347_setup(void) { @@ -10,7 +8,7 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c platform_device_register(&avila_npeb_device); avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO; -@@ -338,6 +339,7 @@ static void __init avila_gw2355_setup(vo +@@ -338,6 +339,7 @@ static void __init avila_gw2357_setup(void) { @@ -18,11 +16,9 @@ Index: linux-2.6.25.4/arch/arm/mach-ixp4xx/avila-setup.c platform_device_register(&avila_npeb_device); avila_gpio_leds[0].gpio = AVILA_GW23X7_LED_USER_GPIO; -Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c -=================================================================== ---- linux-2.6.25.4.orig/drivers/net/arm/ixp4xx_eth.c -+++ linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c -@@ -348,6 +348,14 @@ static void phy_reset(struct net_device +--- a/drivers/net/arm/ixp4xx_eth.c ++++ b/drivers/net/arm/ixp4xx_eth.c +@@ -348,6 +348,14 @@ return; } @@ -37,11 +33,9 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c /* restart auto negotiation */ bmcr = mdio_read(dev, phy_id, MII_BMCR); bmcr |= (BMCR_ANENABLE | BMCR_ANRESTART); -Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/platform.h -=================================================================== ---- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/platform.h -+++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/platform.h -@@ -104,6 +104,8 @@ struct eth_plat_info { +--- a/include/asm-arm/arch-ixp4xx/platform.h ++++ b/include/asm-arm/arch-ixp4xx/platform.h +@@ -104,6 +104,8 @@ u8 txreadyq; u8 hwaddr[6]; u32 phy_mask; |