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/115-mtd-fetch-randomizer-mode.patch | |
| parent | 8e69c9f7ef2e1ca40b33a4a33c76b460c1f62861 (diff) | |
| download | master-31e0f0ae-6be2305da83471c442dab83366c25be4dfb38793.tar.gz master-31e0f0ae-6be2305da83471c442dab83366c25be4dfb38793.tar.bz2 master-31e0f0ae-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/115-mtd-fetch-randomizer-mode.patch')
| -rw-r--r-- | target/linux/sunxi/patches-4.1/115-mtd-fetch-randomizer-mode.patch | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/target/linux/sunxi/patches-4.1/115-mtd-fetch-randomizer-mode.patch b/target/linux/sunxi/patches-4.1/115-mtd-fetch-randomizer-mode.patch index f4c36ec56c..f5dfba0c1c 100644 --- a/target/linux/sunxi/patches-4.1/115-mtd-fetch-randomizer-mode.patch +++ b/target/linux/sunxi/patches-4.1/115-mtd-fetch-randomizer-mode.patch @@ -12,11 +12,9 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com> include/linux/of_mtd.h | 6 ++++++ 2 files changed, 41 insertions(+) -diff --git a/drivers/of/of_mtd.c b/drivers/of/of_mtd.c -index b7361ed..4e42c26 100644 --- a/drivers/of/of_mtd.c +++ b/drivers/of/of_mtd.c -@@ -84,6 +84,41 @@ int of_get_nand_ecc_strength(struct device_node *np) +@@ -84,6 +84,41 @@ int of_get_nand_ecc_strength(struct devi EXPORT_SYMBOL_GPL(of_get_nand_ecc_strength); /** @@ -58,8 +56,6 @@ index b7361ed..4e42c26 100644 * of_get_nand_bus_width - Get nand bus witdh for given device_node * @np: Pointer to the given device_node * -diff --git a/include/linux/of_mtd.h b/include/linux/of_mtd.h -index e266caa..1059472 100644 --- a/include/linux/of_mtd.h +++ b/include/linux/of_mtd.h @@ -15,6 +15,7 @@ @@ -70,15 +66,15 @@ index e266caa..1059472 100644 int of_get_nand_bus_width(struct device_node *np); bool of_get_nand_on_flash_bbt(struct device_node *np); -@@ -35,6 +36,11 @@ static inline int of_get_nand_ecc_strength(struct device_node *np) +@@ -34,6 +35,11 @@ static inline int of_get_nand_ecc_streng + { return -ENOSYS; } - ++ +static inline int of_get_nand_rnd_mode(struct device_node *np) +{ + return -ENOSYS; +} -+ + static inline int of_get_nand_bus_width(struct device_node *np) { - return -ENOSYS; |