aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/oxnas/patches-4.4/0074-mtd-nand-import-nand_hw_control_init.patch
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2018-08-09 20:25:38 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2018-08-09 23:17:09 +0200
commit91d209362b97fc1ff2ab931fe854c99f5a5aae73 (patch)
tree778bbfec6ccf416367686e9ec2ed73f45aacf745 /target/linux/oxnas/patches-4.4/0074-mtd-nand-import-nand_hw_control_init.patch
parentb5d9776cd24bc7dfd181c40560af85712a0040f7 (diff)
downloadupstream-91d209362b97fc1ff2ab931fe854c99f5a5aae73.tar.gz
upstream-91d209362b97fc1ff2ab931fe854c99f5a5aae73.tar.bz2
upstream-91d209362b97fc1ff2ab931fe854c99f5a5aae73.zip
kernel: bump kernel 4.4 to version 4.4.147
target/linux/ar71xx/patches-4.4/103-MIPS-ath79-fix-register-address-in-ath79_ddr_wb_flus.patch has been applied upstream; the two deleted brcm2708 patches have been useless even before (as the second one only reverted the first one). Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Diffstat (limited to 'target/linux/oxnas/patches-4.4/0074-mtd-nand-import-nand_hw_control_init.patch')
-rw-r--r--target/linux/oxnas/patches-4.4/0074-mtd-nand-import-nand_hw_control_init.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/oxnas/patches-4.4/0074-mtd-nand-import-nand_hw_control_init.patch b/target/linux/oxnas/patches-4.4/0074-mtd-nand-import-nand_hw_control_init.patch
index 45c4bc70bb..2c741b9e06 100644
--- a/target/linux/oxnas/patches-4.4/0074-mtd-nand-import-nand_hw_control_init.patch
+++ b/target/linux/oxnas/patches-4.4/0074-mtd-nand-import-nand_hw_control_init.patch
@@ -75,7 +75,7 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
elbc_fcm_ctrl = fsl_lbc_ctrl_dev->nand;
--- a/drivers/mtd/nand/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/fsl_ifc_nand.c
-@@ -1074,8 +1074,7 @@ static int fsl_ifc_nand_probe(struct pla
+@@ -1077,8 +1077,7 @@ static int fsl_ifc_nand_probe(struct pla
ifc_nand_ctrl->addr = NULL;
fsl_ifc_ctrl_dev->nand = ifc_nand_ctrl;