diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2012-04-01 07:56:55 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2012-04-01 07:56:55 +0000 |
| commit | d944e45d6535953d8fa3349e5230a6eecb7e9ecb (patch) | |
| tree | af668f3ffd4777fd9823251436d2a82e2240e1a0 /target/linux/lantiq/patches-3.2/0020-NET-MIPS-lantiq-non-existing-phy-was-not-handled-gra.patch | |
| parent | 49fec54fecdd0290325dbf1c29f30781ede28b8e (diff) | |
| download | upstream-d944e45d6535953d8fa3349e5230a6eecb7e9ecb.tar.gz upstream-d944e45d6535953d8fa3349e5230a6eecb7e9ecb.tar.bz2 upstream-d944e45d6535953d8fa3349e5230a6eecb7e9ecb.zip | |
kernel: update linux 3.2 to 3.2.13 and refresh patches
Also remove a duplicate patch from lantiq (already in generic).
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31158 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.2/0020-NET-MIPS-lantiq-non-existing-phy-was-not-handled-gra.patch')
| -rw-r--r-- | target/linux/lantiq/patches-3.2/0020-NET-MIPS-lantiq-non-existing-phy-was-not-handled-gra.patch | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/target/linux/lantiq/patches-3.2/0020-NET-MIPS-lantiq-non-existing-phy-was-not-handled-gra.patch b/target/linux/lantiq/patches-3.2/0020-NET-MIPS-lantiq-non-existing-phy-was-not-handled-gra.patch index c0cc3d6fc0..95dd0a9ad0 100644 --- a/target/linux/lantiq/patches-3.2/0020-NET-MIPS-lantiq-non-existing-phy-was-not-handled-gra.patch +++ b/target/linux/lantiq/patches-3.2/0020-NET-MIPS-lantiq-non-existing-phy-was-not-handled-gra.patch @@ -16,8 +16,6 @@ Cc: netdev@vger.kernel.org drivers/net/ethernet/lantiq_etop.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) -diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c -index d3d4931..9fd6779 100644 --- a/drivers/net/ethernet/lantiq_etop.c +++ b/drivers/net/ethernet/lantiq_etop.c @@ -612,7 +612,8 @@ ltq_etop_open(struct net_device *dev) @@ -54,7 +52,7 @@ index d3d4931..9fd6779 100644 return 0; err_netdev: -@@ -868,7 +871,6 @@ ltq_etop_probe(struct platform_device *pdev) +@@ -868,7 +871,6 @@ ltq_etop_probe(struct platform_device *p dev = alloc_etherdev_mq(sizeof(struct ltq_etop_priv), 4); strcpy(dev->name, "eth%d"); dev->netdev_ops = <q_eth_netdev_ops; @@ -62,6 +60,3 @@ index d3d4931..9fd6779 100644 priv = netdev_priv(dev); priv->res = res; priv->pldata = dev_get_platdata(&pdev->dev); --- -1.7.7.1 - |