summaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.3/0029-NET-MIPS-lantiq-convert-etop-driver-to-clkdev-api.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-04-17 12:51:02 +0000
committerJonas Gorski <jogo@openwrt.org>2012-04-17 12:51:02 +0000
commit3a9b6dc313ddaddac16ccf0a1cc8672ee065d323 (patch)
tree52ef8f96d3552c60ea801c3acc79865339611a34 /target/linux/lantiq/patches-3.3/0029-NET-MIPS-lantiq-convert-etop-driver-to-clkdev-api.patch
parentee4c47a134723b78162f9f5eedc9f132dd19f6b7 (diff)
downloadmaster-31e0f0ae-3a9b6dc313ddaddac16ccf0a1cc8672ee065d323.tar.gz
master-31e0f0ae-3a9b6dc313ddaddac16ccf0a1cc8672ee065d323.tar.bz2
master-31e0f0ae-3a9b6dc313ddaddac16ccf0a1cc8672ee065d323.zip
kernel: update linux 3.3 to 3.3.2
SVN-Revision: 31336
Diffstat (limited to 'target/linux/lantiq/patches-3.3/0029-NET-MIPS-lantiq-convert-etop-driver-to-clkdev-api.patch')
-rw-r--r--target/linux/lantiq/patches-3.3/0029-NET-MIPS-lantiq-convert-etop-driver-to-clkdev-api.patch7
1 files changed, 1 insertions, 6 deletions
diff --git a/target/linux/lantiq/patches-3.3/0029-NET-MIPS-lantiq-convert-etop-driver-to-clkdev-api.patch b/target/linux/lantiq/patches-3.3/0029-NET-MIPS-lantiq-convert-etop-driver-to-clkdev-api.patch
index c48fb9bc79..b00fbe45e9 100644
--- a/target/linux/lantiq/patches-3.3/0029-NET-MIPS-lantiq-convert-etop-driver-to-clkdev-api.patch
+++ b/target/linux/lantiq/patches-3.3/0029-NET-MIPS-lantiq-convert-etop-driver-to-clkdev-api.patch
@@ -11,8 +11,6 @@ Cc: netdev@vger.kernel.org
drivers/net/ethernet/lantiq_etop.c | 49 ++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 7 deletions(-)
-diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
-index ad0fa54..8fbb069 100644
--- a/drivers/net/ethernet/lantiq_etop.c
+++ b/drivers/net/ethernet/lantiq_etop.c
@@ -36,6 +36,7 @@
@@ -93,7 +91,7 @@ index ad0fa54..8fbb069 100644
/* we need to write this magic to the internal phy to
make it work */
ltq_etop_mdio_wr(NULL, 0x8, 0x12, 0xC020);
-@@ -883,6 +900,24 @@ ltq_etop_probe(struct platform_device *pdev)
+@@ -883,6 +900,24 @@ ltq_etop_probe(struct platform_device *p
priv->pdev = pdev;
priv->pldata = dev_get_platdata(&pdev->dev);
priv->netdev = dev;
@@ -118,6 +116,3 @@ index ad0fa54..8fbb069 100644
spin_lock_init(&priv->lock);
for (i = 0; i < MAX_DMA_CHAN; i++) {
---
-1.7.9.1
-