diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2016-01-12 20:50:41 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2016-01-12 20:50:41 +0000 |
commit | ba3a749f9b29b40784bb576651142c601d4a7211 (patch) | |
tree | 5adb2f84ad87b100b0a0bde6f1e0407aa32203e1 /target/linux/generic | |
parent | bd99318c820c47af63c30dcf12fb3f929c257180 (diff) | |
download | upstream-ba3a749f9b29b40784bb576651142c601d4a7211.tar.gz upstream-ba3a749f9b29b40784bb576651142c601d4a7211.tar.bz2 upstream-ba3a749f9b29b40784bb576651142c601d4a7211.zip |
kernel: refresh patches for kernel 4.4
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 48222
Diffstat (limited to 'target/linux/generic')
-rw-r--r-- | target/linux/generic/patches-4.4/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch | 8 | ||||
-rw-r--r-- | target/linux/generic/patches-4.4/735-net-phy-at803x-fix-at8033-sgmii-mode.patch | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/generic/patches-4.4/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch b/target/linux/generic/patches-4.4/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch index 6adac77669..5ad82f1f51 100644 --- a/target/linux/generic/patches-4.4/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch +++ b/target/linux/generic/patches-4.4/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch @@ -13,7 +13,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> --- a/drivers/mtd/bcm47xxpart.c +++ b/drivers/mtd/bcm47xxpart.c -@@ -61,6 +61,34 @@ static void bcm47xxpart_add_part(struct mtd_partition *part, const char *name, +@@ -61,6 +61,34 @@ static void bcm47xxpart_add_part(struct part->mask_flags = mask_flags; } @@ -48,7 +48,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> static const char *bcm47xxpart_trx_data_part_name(struct mtd_info *master, size_t offset) { -@@ -182,6 +210,8 @@ static int bcm47xxpart_parse(struct mtd_info *master, +@@ -182,6 +210,8 @@ static int bcm47xxpart_parse(struct mtd_ /* TRX */ if (buf[0x000 / 4] == TRX_MAGIC) { @@ -57,7 +57,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> if (BCM47XXPART_MAX_PARTS - curr_part < 4) { pr_warn("Not enough partitions left to register trx, scanning stopped!\n"); break; -@@ -196,18 +226,18 @@ static int bcm47xxpart_parse(struct mtd_info *master, +@@ -196,18 +226,18 @@ static int bcm47xxpart_parse(struct mtd_ i = 0; /* We have LZMA loader if offset[2] points to sth */ if (trx->offset[2]) { @@ -82,7 +82,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> i++; } -@@ -219,11 +249,11 @@ static int bcm47xxpart_parse(struct mtd_info *master, +@@ -219,11 +249,11 @@ static int bcm47xxpart_parse(struct mtd_ if (trx->offset[i]) { const char *name; diff --git a/target/linux/generic/patches-4.4/735-net-phy-at803x-fix-at8033-sgmii-mode.patch b/target/linux/generic/patches-4.4/735-net-phy-at803x-fix-at8033-sgmii-mode.patch index 117f15d634..60de6b4f7d 100644 --- a/target/linux/generic/patches-4.4/735-net-phy-at803x-fix-at8033-sgmii-mode.patch +++ b/target/linux/generic/patches-4.4/735-net-phy-at803x-fix-at8033-sgmii-mode.patch @@ -61,7 +61,7 @@ .probe = at803x_probe, .config_init = at803x_config_init, .link_change_notify = at803x_link_change_notify, -@@ -413,7 +438,7 @@ static struct phy_driver at803x_driver[] +@@ -415,7 +440,7 @@ static struct phy_driver at803x_driver[] /* ATHEROS 8030 */ .phy_id = ATH8030_PHY_ID, .name = "Atheros 8030 ethernet", @@ -70,7 +70,7 @@ .probe = at803x_probe, .config_init = at803x_config_init, .link_change_notify = at803x_link_change_notify, -@@ -431,8 +456,8 @@ static struct phy_driver at803x_driver[] +@@ -435,8 +460,8 @@ static struct phy_driver at803x_driver[] }, { /* ATHEROS 8031 */ .phy_id = ATH8031_PHY_ID, @@ -81,7 +81,7 @@ .probe = at803x_probe, .config_init = at803x_config_init, .link_change_notify = at803x_link_change_notify, -@@ -454,9 +479,9 @@ static struct phy_driver at803x_driver[] +@@ -458,9 +483,9 @@ static struct phy_driver at803x_driver[] module_phy_driver(at803x_driver); static struct mdio_device_id __maybe_unused atheros_tbl[] = { |