aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.14/0160-owrt-lantiq-multiple-flash.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-12-08 12:04:25 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-12-08 12:04:25 +0000
commit6e4472e69e89aa56ad8c0e6f90415a2b8da36eba (patch)
treeb35c1688c3303eb7f7dff2304798f8eb320812fb /target/linux/lantiq/patches-3.14/0160-owrt-lantiq-multiple-flash.patch
parenta899dbd4e32835b0a1d917479d10e5a2744c273c (diff)
downloadupstream-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.tar.gz
upstream-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.tar.bz2
upstream-6e4472e69e89aa56ad8c0e6f90415a2b8da36eba.zip
kernel: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43564 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.14/0160-owrt-lantiq-multiple-flash.patch')
-rw-r--r--target/linux/lantiq/patches-3.14/0160-owrt-lantiq-multiple-flash.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/lantiq/patches-3.14/0160-owrt-lantiq-multiple-flash.patch b/target/linux/lantiq/patches-3.14/0160-owrt-lantiq-multiple-flash.patch
index 87e6cbb89a..ac644abb51 100644
--- a/target/linux/lantiq/patches-3.14/0160-owrt-lantiq-multiple-flash.patch
+++ b/target/linux/lantiq/patches-3.14/0160-owrt-lantiq-multiple-flash.patch
@@ -1,5 +1,5 @@
---- "a/drivers/mtd/maps/lantiq-flash.c"
-+++ "b/drivers/mtd/maps/lantiq-flash.c"
+--- a/drivers/mtd/maps/lantiq-flash.c
++++ b/drivers/mtd/maps/lantiq-flash.c
@@ -20,6 +20,7 @@
#include <linux/mtd/cfi.h>
#include <linux/platform_device.h>
@@ -8,7 +8,7 @@
#include <linux/of.h>
#include <lantiq_soc.h>
-@@ -39,10 +40,12 @@
+@@ -39,10 +40,12 @@ enum {
LTQ_NOR_NORMAL
};
@@ -24,7 +24,7 @@
};
static const char ltq_map_name[] = "ltq_nor";
-@@ -110,12 +113,39 @@
+@@ -110,12 +113,39 @@ ltq_copy_to(struct map_info *map, unsign
}
static int
@@ -65,7 +65,7 @@
static const char *rom_probe_types[] = {
"cfi_probe", "jedec_probe", NULL
-@@ -134,79 +164,88 @@
+@@ -134,79 +164,88 @@ ltq_mtd_probe(struct platform_device *pd
platform_set_drvdata(pdev, ltq_mtd);