diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2016-06-20 23:26:13 +0200 |
|---|---|---|
| committer | Zoltan HERPAI <wigyori@uid0.hu> | 2016-06-20 23:26:13 +0200 |
| commit | 9d81678ab01a06ee718e33c2f2d3913cec684840 (patch) | |
| tree | 29a5c4b2374b3f05652b496135257107ecb8765f /target/linux/mediatek/patches-4.4/0095-net-next-mediatek-add-IRQ-locking.patch | |
| parent | 2dc1e11c688a439084692e0b86d20adc0310d42c (diff) | |
| download | master-187ad058-9d81678ab01a06ee718e33c2f2d3913cec684840.tar.gz master-187ad058-9d81678ab01a06ee718e33c2f2d3913cec684840.tar.bz2 master-187ad058-9d81678ab01a06ee718e33c2f2d3913cec684840.zip | |
kernel: update kernel 4.4 to version 4.4.12
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/mediatek/patches-4.4/0095-net-next-mediatek-add-IRQ-locking.patch')
| -rw-r--r-- | target/linux/mediatek/patches-4.4/0095-net-next-mediatek-add-IRQ-locking.patch | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/target/linux/mediatek/patches-4.4/0095-net-next-mediatek-add-IRQ-locking.patch b/target/linux/mediatek/patches-4.4/0095-net-next-mediatek-add-IRQ-locking.patch index ff21c09ac3..bf27aac15c 100644 --- a/target/linux/mediatek/patches-4.4/0095-net-next-mediatek-add-IRQ-locking.patch +++ b/target/linux/mediatek/patches-4.4/0095-net-next-mediatek-add-IRQ-locking.patch @@ -17,11 +17,9 @@ Signed-off-by: John Crispin <john@phrozen.org> drivers/net/ethernet/mediatek/mtk_eth_soc.h | 1 + 2 files changed, 8 insertions(+) -diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -index 13ee15f..c869064 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -331,18 +331,24 @@ static void mtk_mdio_cleanup(struct mtk_eth *eth) +@@ -331,18 +331,24 @@ static void mtk_mdio_cleanup(struct mtk_ static inline void mtk_irq_disable(struct mtk_eth *eth, u32 mask) { @@ -46,7 +44,7 @@ index 13ee15f..c869064 100644 } static int mtk_set_mac_address(struct net_device *dev, void *p) -@@ -1771,6 +1777,7 @@ static int mtk_probe(struct platform_device *pdev) +@@ -1771,6 +1777,7 @@ static int mtk_probe(struct platform_dev return -EADDRNOTAVAIL; spin_lock_init(ð->page_lock); @@ -54,8 +52,6 @@ index 13ee15f..c869064 100644 eth->ethsys = syscon_regmap_lookup_by_phandle(pdev->dev.of_node, "mediatek,ethsys"); -diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h -index a5eb7c6..3159d2a 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h @@ -373,6 +373,7 @@ struct mtk_eth { @@ -66,6 +62,3 @@ index a5eb7c6..3159d2a 100644 struct net_device dummy_dev; struct net_device *netdev[MTK_MAX_DEVS]; struct mtk_mac *mac[MTK_MAX_DEVS]; --- -1.7.10.4 - |