aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2012-02-14 19:07:05 +0000
committerJohn Crispin <john@openwrt.org>2012-02-14 19:07:05 +0000
commit7416a5f0aa7bd9a239baf7ded112d2339884aa8a (patch)
tree20d8a14af59d5a4b4aa1b82660e679a4c200536c /target/linux/lantiq
parentcd1a204365fff2639329c28c1b986f3a4e7246d4 (diff)
downloadupstream-7416a5f0aa7bd9a239baf7ded112d2339884aa8a.tar.gz
upstream-7416a5f0aa7bd9a239baf7ded112d2339884aa8a.tar.bz2
upstream-7416a5f0aa7bd9a239baf7ded112d2339884aa8a.zip
fix compile error in previous commit
SVN-Revision: 30534
Diffstat (limited to 'target/linux/lantiq')
-rw-r--r--target/linux/lantiq/patches/206-owrt-brnboot.patch20
1 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/lantiq/patches/206-owrt-brnboot.patch b/target/linux/lantiq/patches/206-owrt-brnboot.patch
index c21d76d1f8..d10d66b1e2 100644
--- a/target/linux/lantiq/patches/206-owrt-brnboot.patch
+++ b/target/linux/lantiq/patches/206-owrt-brnboot.patch
@@ -1,7 +1,7 @@
-Index: linux-3.1.9/drivers/mtd/mtdpart.c
+Index: linux-3.1.10/drivers/mtd/mtdpart.c
===================================================================
---- linux-3.1.9.orig/drivers/mtd/mtdpart.c 2012-01-29 22:55:30.295904157 +0100
-+++ linux-3.1.9/drivers/mtd/mtdpart.c 2012-01-29 22:55:30.395904294 +0100
+--- linux-3.1.10.orig/drivers/mtd/mtdpart.c 2012-02-14 19:38:40.102266817 +0100
++++ linux-3.1.10/drivers/mtd/mtdpart.c 2012-02-14 19:38:40.146266819 +0100
@@ -899,6 +899,38 @@
return le32_to_cpu(temp) == SQUASHFS_MAGIC;
}
@@ -55,22 +55,22 @@ Index: linux-3.1.9/drivers/mtd/mtdpart.c
}
if (!detect_squashfs_partition(mtd,
-Index: linux-3.1.9/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h
+Index: linux-3.1.10/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h
===================================================================
---- linux-3.1.9.orig/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h 2012-01-29 22:55:30.195904014 +0100
-+++ linux-3.1.9/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h 2012-01-29 22:55:30.395904294 +0100
+--- linux-3.1.10.orig/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h 2012-02-14 19:38:40.058266816 +0100
++++ linux-3.1.10/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h 2012-02-14 19:57:07.790314179 +0100
@@ -149,6 +149,7 @@
extern __iomem void *ltq_ebu_membase;
extern __iomem void *ltq_cgu_membase;
-+extern long ltq_brn_boot;
++extern unsigned long ltq_brn_boot;
/* request a non-gpio and set the PIO config */
extern int ltq_gpio_request(unsigned int pin, unsigned int alt0,
-Index: linux-3.1.9/arch/mips/lantiq/setup.c
+Index: linux-3.1.10/arch/mips/lantiq/setup.c
===================================================================
---- linux-3.1.9.orig/arch/mips/lantiq/setup.c 2012-01-29 22:55:30.095903875 +0100
-+++ linux-3.1.9/arch/mips/lantiq/setup.c 2012-01-29 22:59:28.686237119 +0100
+--- linux-3.1.10.orig/arch/mips/lantiq/setup.c 2012-02-14 19:38:40.010266814 +0100
++++ linux-3.1.10/arch/mips/lantiq/setup.c 2012-02-14 19:38:40.150266820 +0100
@@ -20,6 +20,8 @@
/* assume 16M as default incase uboot fails to pass proper ramsize */