diff options
author | Jonas Gorski <jogo@openwrt.org> | 2015-08-14 13:06:33 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2015-08-14 13:06:33 +0000 |
commit | 6be2305da83471c442dab83366c25be4dfb38793 (patch) | |
tree | 30cfe6f3fc964dca1936646468c87367b509e929 /target/linux/sunxi/patches-4.1/125-mtd-nand-sunxi-extend-bbt_options.patch | |
parent | 8e69c9f7ef2e1ca40b33a4a33c76b460c1f62861 (diff) | |
download | upstream-6be2305da83471c442dab83366c25be4dfb38793.tar.gz upstream-6be2305da83471c442dab83366c25be4dfb38793.tar.bz2 upstream-6be2305da83471c442dab83366c25be4dfb38793.zip |
kernel: update 4.1 to 4.1.5
Changelog:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.5
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 46598
Diffstat (limited to 'target/linux/sunxi/patches-4.1/125-mtd-nand-sunxi-extend-bbt_options.patch')
-rw-r--r-- | target/linux/sunxi/patches-4.1/125-mtd-nand-sunxi-extend-bbt_options.patch | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/target/linux/sunxi/patches-4.1/125-mtd-nand-sunxi-extend-bbt_options.patch b/target/linux/sunxi/patches-4.1/125-mtd-nand-sunxi-extend-bbt_options.patch index 19775eb5a6..25b9359daa 100644 --- a/target/linux/sunxi/patches-4.1/125-mtd-nand-sunxi-extend-bbt_options.patch +++ b/target/linux/sunxi/patches-4.1/125-mtd-nand-sunxi-extend-bbt_options.patch @@ -14,11 +14,9 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com> drivers/mtd/nand/sunxi_nand.c | 9 +++++++++ 1 file changed, 9 insertions(+) -diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c -index 74f2caf..72ab770 100644 --- a/drivers/mtd/nand/sunxi_nand.c +++ b/drivers/mtd/nand/sunxi_nand.c -@@ -1853,6 +1853,15 @@ static int sunxi_nand_chip_init(struct device *dev, struct sunxi_nfc *nfc, +@@ -1853,6 +1853,15 @@ static int sunxi_nand_chip_init(struct d if (of_get_nand_on_flash_bbt(np)) nand->bbt_options |= NAND_BBT_USE_FLASH | NAND_BBT_NO_OOB; |