diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-08-23 18:06:11 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-08-23 18:06:11 +0000 |
| commit | 2d379e796f27e7ab4bbc3d5406776722ecba379b (patch) | |
| tree | 65aa809ad1c4083c2b4a663c29034ebffe1449d0 /target/linux/sunxi/patches-4.1/118-mtd-nand-fix-NAND_options.patch | |
| parent | 2190f090bb8bd1a575cc3534cb799e14841cb3f1 (diff) | |
| download | mtk-20170518-2d379e796f27e7ab4bbc3d5406776722ecba379b.zip mtk-20170518-2d379e796f27e7ab4bbc3d5406776722ecba379b.tar.gz mtk-20170518-2d379e796f27e7ab4bbc3d5406776722ecba379b.tar.bz2 | |
kernel: update 4.1 to 4.1.6
Changelog:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.6
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 46713
Diffstat (limited to 'target/linux/sunxi/patches-4.1/118-mtd-nand-fix-NAND_options.patch')
| -rw-r--r-- | target/linux/sunxi/patches-4.1/118-mtd-nand-fix-NAND_options.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/target/linux/sunxi/patches-4.1/118-mtd-nand-fix-NAND_options.patch b/target/linux/sunxi/patches-4.1/118-mtd-nand-fix-NAND_options.patch deleted file mode 100644 index 278edd4..0000000 --- a/target/linux/sunxi/patches-4.1/118-mtd-nand-fix-NAND_options.patch +++ /dev/null @@ -1,41 +0,0 @@ -From f8ff99a839ed05e1e4993b543357183b095b77f1 Mon Sep 17 00:00:00 2001 -From: Michal Suchanek <hramrach@gmail.com> -Date: Thu, 1 Jan 2015 16:44:45 +0100 -Subject: [PATCH] mtd: nand: Fix NAND_* options to use unique values. - -NAND_BUSWIDTH_AUTO (64b37b2a6) and NAND_USE_BOUNCE_BUFFER (66507c7bc) -are the same value. Change the later introduced NAND_USE_BOUNCE_BUFFER -to a different value. - -Signed-off-by: Michal Suchanek <hramrach@gmail.com> -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - include/linux/mtd/nand.h | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - ---- a/include/linux/mtd/nand.h -+++ b/include/linux/mtd/nand.h -@@ -176,17 +176,17 @@ typedef enum { - /* Chip may not exist, so silence any errors in scan */ - #define NAND_SCAN_SILENT_NODEV 0x00040000 - /* -- * This option could be defined by controller drivers to protect against -- * kmap'ed, vmalloc'ed highmem buffers being passed from upper layers -- */ --#define NAND_USE_BOUNCE_BUFFER 0x00080000 --/* - * Autodetect nand buswidth with readid/onfi. - * This suppose the driver will configure the hardware in 8 bits mode - * when calling nand_scan_ident, and update its configuration - * before calling nand_scan_tail. - */ --#define NAND_BUSWIDTH_AUTO 0x00080000 -+#define NAND_BUSWIDTH_AUTO 0x00080000 -+/* -+ * This option could be defined by controller drivers to protect against -+ * kmap'ed, vmalloc'ed highmem buffers being passed from upper layers -+ */ -+#define NAND_USE_BOUNCE_BUFFER 0x00100000 - - /* Options set by nand scan */ - /* Nand scan has allocated controller struct */ |