summaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-08-25 12:13:18 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-08-25 12:13:18 +0000
commit739b883f1ee438c4519191eb7295d177f245680a (patch)
treec38865fe0998b7dec1e1d104372aac2039ba8a20 /target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch
parent995c77809b20f5c032df27461324bab541280088 (diff)
ixp4xx: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17397 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch')
-rw-r--r--target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch b/target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch
index 885ececed..6120176b6 100644
--- a/target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch
+++ b/target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch
@@ -73,7 +73,7 @@
if (!ports_open)
qmgr_disable_irq(TXDONE_QUEUE);
-@@ -1149,7 +1195,6 @@ static int __devinit eth_init_one(struct
+@@ -1151,7 +1197,6 @@ static int __devinit eth_init_one(struct
struct net_device *dev;
struct eth_plat_info *plat = pdev->dev.platform_data;
u32 regs_phys;
@@ -81,7 +81,7 @@
int err;
if (!(dev = alloc_etherdev(sizeof(struct port))))
-@@ -1207,18 +1252,10 @@ static int __devinit eth_init_one(struct
+@@ -1209,18 +1254,10 @@ static int __devinit eth_init_one(struct
__raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
udelay(50);
@@ -102,7 +102,7 @@
if ((err = register_netdev(dev)))
goto err_phy_dis;
-@@ -1245,7 +1282,7 @@ static int __devexit eth_remove_one(stru
+@@ -1247,7 +1284,7 @@ static int __devexit eth_remove_one(stru
struct net_device *dev = platform_get_drvdata(pdev);
struct port *port = netdev_priv(dev);