diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2013-01-18 11:44:42 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2013-01-18 11:44:42 +0000 |
commit | 3ab3849ad331f8a5aa1da219de962581b695fc58 (patch) | |
tree | 2fc9a618bfa15d90952ffe9ef8964dd0eec75269 /target/linux/ar71xx | |
parent | edeb64dc6567c5aee27d674388b3cdd759a050c9 (diff) | |
download | upstream-3ab3849ad331f8a5aa1da219de962581b695fc58.tar.gz upstream-3ab3849ad331f8a5aa1da219de962581b695fc58.tar.bz2 upstream-3ab3849ad331f8a5aa1da219de962581b695fc58.zip |
kernel: update linux 3.7 to 3.7.3
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35216 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx')
-rw-r--r-- | target/linux/ar71xx/Makefile | 2 | ||||
-rw-r--r-- | target/linux/ar71xx/patches-3.7/500-MIPS-fw-myloader.patch | 2 | ||||
-rw-r--r-- | target/linux/ar71xx/patches-3.7/902-unaligned_access_hacks.patch | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index b95d2581a7..2a197eda5d 100644 --- a/target/linux/ar71xx/Makefile +++ b/target/linux/ar71xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs jffs2 targz CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves -mno-branch-likely SUBTARGETS:=generic nand -LINUX_VERSION:=3.7.2 +LINUX_VERSION:=3.7.3 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ar71xx/patches-3.7/500-MIPS-fw-myloader.patch b/target/linux/ar71xx/patches-3.7/500-MIPS-fw-myloader.patch index d07aba7f89..3559a27a2c 100644 --- a/target/linux/ar71xx/patches-3.7/500-MIPS-fw-myloader.patch +++ b/target/linux/ar71xx/patches-3.7/500-MIPS-fw-myloader.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -175,6 +175,7 @@ endif +@@ -180,6 +180,7 @@ endif # libs-$(CONFIG_ARC) += arch/mips/fw/arc/ libs-$(CONFIG_CFE) += arch/mips/fw/cfe/ diff --git a/target/linux/ar71xx/patches-3.7/902-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-3.7/902-unaligned_access_hacks.patch index fc05676b83..e7e1712b7e 100644 --- a/target/linux/ar71xx/patches-3.7/902-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-3.7/902-unaligned_access_hacks.patch @@ -288,7 +288,7 @@ #include <asm/uaccess.h> #include <linux/proc_fs.h> -@@ -851,10 +852,10 @@ static void tcp_v6_send_response(struct +@@ -851,10 +852,10 @@ static void tcp_v6_send_response(struct topt = (__be32 *)(t1 + 1); if (ts) { @@ -415,7 +415,7 @@ if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK) fl6.flowi6_mark = skb->mark; -@@ -1256,7 +1256,7 @@ static int ip6gre_header(struct sk_buff +@@ -1256,7 +1256,7 @@ static int ip6gre_header(struct sk_buff struct ipv6hdr *ipv6h = (struct ipv6hdr *)skb_push(skb, t->hlen); __be16 *p = (__be16 *)(ipv6h+1); |