aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/sunxi/patches-4.1/112-mtd-add-dt-nand-partition-parser.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-08-14 13:06:33 +0000
committerJonas Gorski <jogo@openwrt.org>2015-08-14 13:06:33 +0000
commit098f187e7870684bfaaa53a1fdfc9682cc1e0dae (patch)
treee4f67db9483b1ce0d774fc67ab46a18171579338 /target/linux/sunxi/patches-4.1/112-mtd-add-dt-nand-partition-parser.patch
parentbbf13d61b7377b5114d9c716b7326f3f2bc468c1 (diff)
downloadmaster-187ad058-098f187e7870684bfaaa53a1fdfc9682cc1e0dae.tar.gz
master-187ad058-098f187e7870684bfaaa53a1fdfc9682cc1e0dae.tar.bz2
master-187ad058-098f187e7870684bfaaa53a1fdfc9682cc1e0dae.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46598 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/sunxi/patches-4.1/112-mtd-add-dt-nand-partition-parser.patch')
-rw-r--r--target/linux/sunxi/patches-4.1/112-mtd-add-dt-nand-partition-parser.patch7
1 files changed, 1 insertions, 6 deletions
diff --git a/target/linux/sunxi/patches-4.1/112-mtd-add-dt-nand-partition-parser.patch b/target/linux/sunxi/patches-4.1/112-mtd-add-dt-nand-partition-parser.patch
index 135f50a5cb..76f0051266 100644
--- a/target/linux/sunxi/patches-4.1/112-mtd-add-dt-nand-partition-parser.patch
+++ b/target/linux/sunxi/patches-4.1/112-mtd-add-dt-nand-partition-parser.patch
@@ -17,9 +17,6 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2 files changed, 121 insertions(+)
create mode 100644 drivers/mtd/nand/ofnandpart.c
-diff --git a/drivers/mtd/nand/ofnandpart.c b/drivers/mtd/nand/ofnandpart.c
-new file mode 100644
-index 0000000..293daee
--- /dev/null
+++ b/drivers/mtd/nand/ofnandpart.c
@@ -0,0 +1,104 @@
@@ -127,11 +124,9 @@ index 0000000..293daee
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Parser for NAND flash partitioning information in device tree");
+MODULE_AUTHOR("Boris BREZILLON");
-diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
-index 510e09b..5616f51 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
-@@ -1013,6 +1013,23 @@ static inline int jedec_feature(struct nand_chip *chip)
+@@ -1014,6 +1014,23 @@ static inline int jedec_feature(struct n
: 0;
}