aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.2/0003-MTD-MIPS-lantiq-reintroduce-support-for-cmdline-part.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2012-04-01 07:56:55 +0000
committerJonas Gorski <jogo@openwrt.org>2012-04-01 07:56:55 +0000
commitd944e45d6535953d8fa3349e5230a6eecb7e9ecb (patch)
treeaf668f3ffd4777fd9823251436d2a82e2240e1a0 /target/linux/lantiq/patches-3.2/0003-MTD-MIPS-lantiq-reintroduce-support-for-cmdline-part.patch
parent49fec54fecdd0290325dbf1c29f30781ede28b8e (diff)
downloadupstream-d944e45d6535953d8fa3349e5230a6eecb7e9ecb.tar.gz
upstream-d944e45d6535953d8fa3349e5230a6eecb7e9ecb.tar.bz2
upstream-d944e45d6535953d8fa3349e5230a6eecb7e9ecb.zip
kernel: update linux 3.2 to 3.2.13 and refresh patches
Also remove a duplicate patch from lantiq (already in generic). git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31158 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.2/0003-MTD-MIPS-lantiq-reintroduce-support-for-cmdline-part.patch')
-rw-r--r--target/linux/lantiq/patches-3.2/0003-MTD-MIPS-lantiq-reintroduce-support-for-cmdline-part.patch7
1 files changed, 1 insertions, 6 deletions
diff --git a/target/linux/lantiq/patches-3.2/0003-MTD-MIPS-lantiq-reintroduce-support-for-cmdline-part.patch b/target/linux/lantiq/patches-3.2/0003-MTD-MIPS-lantiq-reintroduce-support-for-cmdline-part.patch
index 64b21011c2..02617eef3c 100644
--- a/target/linux/lantiq/patches-3.2/0003-MTD-MIPS-lantiq-reintroduce-support-for-cmdline-part.patch
+++ b/target/linux/lantiq/patches-3.2/0003-MTD-MIPS-lantiq-reintroduce-support-for-cmdline-part.patch
@@ -13,8 +13,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
drivers/mtd/maps/lantiq-flash.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
-diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c
-index 4f10e27..764d468 100644
--- a/drivers/mtd/maps/lantiq-flash.c
+++ b/drivers/mtd/maps/lantiq-flash.c
@@ -45,6 +45,7 @@ struct ltq_mtd {
@@ -25,7 +23,7 @@ index 4f10e27..764d468 100644
static map_word
ltq_read16(struct map_info *map, unsigned long adr)
-@@ -168,7 +169,7 @@ ltq_mtd_probe(struct platform_device *pdev)
+@@ -168,7 +169,7 @@ ltq_mtd_probe(struct platform_device *pd
cfi->addr_unlock1 ^= 1;
cfi->addr_unlock2 ^= 1;
@@ -34,6 +32,3 @@ index 4f10e27..764d468 100644
ltq_mtd_data->parts, ltq_mtd_data->nr_parts);
if (err) {
dev_err(&pdev->dev, "failed to add partitions\n");
---
-1.7.7.1
-