aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.2/0033-NET-MIPS-lantiq-convert-etop-driver-to-clkdev-api.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-04-01 07:56:55 +0000
committerJonas Gorski <jogo@openwrt.org>2012-04-01 07:56:55 +0000
commitd87efd8c3c2acd5d0f96b25514282a84f425419f (patch)
tree1d89c8f9fb694414d9ae46d89bddf584f94c9b00 /target/linux/lantiq/patches-3.2/0033-NET-MIPS-lantiq-convert-etop-driver-to-clkdev-api.patch
parent1a395bd290a84223da5d915b7e38b6ca23d14c09 (diff)
downloadupstream-d87efd8c3c2acd5d0f96b25514282a84f425419f.tar.gz
upstream-d87efd8c3c2acd5d0f96b25514282a84f425419f.tar.bz2
upstream-d87efd8c3c2acd5d0f96b25514282a84f425419f.zip
kernel: update linux 3.2 to 3.2.13 and refresh patches
Also remove a duplicate patch from lantiq (already in generic). SVN-Revision: 31158
Diffstat (limited to 'target/linux/lantiq/patches-3.2/0033-NET-MIPS-lantiq-convert-etop-driver-to-clkdev-api.patch')
-rw-r--r--target/linux/lantiq/patches-3.2/0033-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.2/0033-NET-MIPS-lantiq-convert-etop-driver-to-clkdev-api.patch b/target/linux/lantiq/patches-3.2/0033-NET-MIPS-lantiq-convert-etop-driver-to-clkdev-api.patch
index a57b956048..daf33c9711 100644
--- a/target/linux/lantiq/patches-3.2/0033-NET-MIPS-lantiq-convert-etop-driver-to-clkdev-api.patch
+++ b/target/linux/lantiq/patches-3.2/0033-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 fcbb9c7..a084d74 100644
--- a/drivers/net/ethernet/lantiq_etop.c
+++ b/drivers/net/ethernet/lantiq_etop.c
@@ -36,6 +36,7 @@
@@ -93,7 +91,7 @@ index fcbb9c7..a084d74 100644
/* we need to write this magic to the internal phy to
make it work */
ltq_etop_mdio_wr(NULL, 0x8, 0x12, 0xC020);
-@@ -880,6 +897,24 @@ ltq_etop_probe(struct platform_device *pdev)
+@@ -880,6 +897,24 @@ ltq_etop_probe(struct platform_device *p
priv->res = res;
priv->pldata = dev_get_platdata(&pdev->dev);
priv->netdev = dev;
@@ -118,6 +116,3 @@ index fcbb9c7..a084d74 100644
spin_lock_init(&priv->lock);
for (i = 0; i < MAX_DMA_CHAN; i++) {
---
-1.7.7.1
-