diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-11-25 20:06:39 +0100 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2019-07-04 08:29:13 +0200 |
| commit | f0c740650b466ffacae64a6f7b67ffacdaf28efd (patch) | |
| tree | 04acdaa9aadb6bda2811b4cf275c23f18d2b830e /target/linux/lantiq/patches-4.19/0701-NET-lantiq-etop-of-mido.patch | |
| parent | eee1b34ce688efcb824ea9ce08edfce7ec507599 (diff) | |
| download | upstream-f0c740650b466ffacae64a6f7b67ffacdaf28efd.tar.gz upstream-f0c740650b466ffacae64a6f7b67ffacdaf28efd.tar.bz2 upstream-f0c740650b466ffacae64a6f7b67ffacdaf28efd.zip | |
lantiq: make patches apply
The following patches are dropped because they are now upstreamed:
- 0002-gpio-stp-xway-Implement-get-callback.patch
upstreamed with commit 5b9b2b5284f819 ("gpio: stp-xway: Implement get
callback")
- 0027-01-net-phy-intel-xway-add-VR9-version-number.patch
upstreamed with commit 5b73d9955fb4b0 ("net: phy: intel-xway: add VR9
version number")
- 0027-02-net-phy-intel-xway-add-VR9-v1.1-phy-ids.patch
upstreamed with commit f452518c982e57 ("net: phy: intel-xway: add VR9
v1.1 phy ids")
The following patches were updated:
- 0018-MTD-nand-lots-of-xrx200-fixes.patch
the mainline driver now resides in drivers/mtd/nand/raw/xway_nand.c
(instead of drivers/mtd/nand/xway_nand.c)
- 0025-NET-MIPS-lantiq-adds-xrx200-net.patch
the DMA API now requires a valid device to be passed to all operations
- 0028-NET-lantiq-various-etop-fixes.patch
the DMA API now requires a valid device to be passed to all operations
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target/linux/lantiq/patches-4.19/0701-NET-lantiq-etop-of-mido.patch')
| -rw-r--r-- | target/linux/lantiq/patches-4.19/0701-NET-lantiq-etop-of-mido.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/lantiq/patches-4.19/0701-NET-lantiq-etop-of-mido.patch b/target/linux/lantiq/patches-4.19/0701-NET-lantiq-etop-of-mido.patch index 5dc4b81522..d53d09c162 100644 --- a/target/linux/lantiq/patches-4.19/0701-NET-lantiq-etop-of-mido.patch +++ b/target/linux/lantiq/patches-4.19/0701-NET-lantiq-etop-of-mido.patch @@ -8,7 +8,7 @@ #include <asm/checksum.h> -@@ -567,7 +568,8 @@ static int +@@ -569,7 +570,8 @@ static int ltq_etop_mdio_init(struct net_device *dev) { struct ltq_etop_priv *priv = netdev_priv(dev); @@ -18,7 +18,7 @@ priv->mii_bus = mdiobus_alloc(); if (!priv->mii_bus) { -@@ -587,7 +589,15 @@ ltq_etop_mdio_init(struct net_device *de +@@ -589,7 +591,15 @@ ltq_etop_mdio_init(struct net_device *de priv->mii_bus->name = "ltq_mii"; snprintf(priv->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x", priv->pdev->name, priv->pdev->id); |