aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-11-18 08:41:31 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-11-18 08:41:31 +0000
commita0e5999983362e1815082f1ca3176dbaff95bf99 (patch)
tree5944d950befc6e8fa54f52f81ab79305cc4b79f6 /target/linux/ramips
parenteffd4b76ec17b9597b10b17fbec80df568cf66a9 (diff)
downloadupstream-a0e5999983362e1815082f1ca3176dbaff95bf99.tar.gz
upstream-a0e5999983362e1815082f1ca3176dbaff95bf99.tar.bz2
upstream-a0e5999983362e1815082f1ca3176dbaff95bf99.zip
kernel: update linux 3.6 to 3.6.7
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34227 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips')
-rw-r--r--target/linux/ramips/Makefile2
-rw-r--r--target/linux/ramips/patches-3.6/011-mtd-cfi_cmdset_0002-force-word-write.patch6
2 files changed, 3 insertions, 5 deletions
diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile
index 5ff8e86b8e..325a41cb06 100644
--- a/target/linux/ramips/Makefile
+++ b/target/linux/ramips/Makefile
@@ -13,7 +13,7 @@ SUBTARGETS:=rt288x rt305x rt3883
CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves
FEATURES:=squashfs
-LINUX_VERSION:=3.6.6
+LINUX_VERSION:=3.6.7
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES+=\
diff --git a/target/linux/ramips/patches-3.6/011-mtd-cfi_cmdset_0002-force-word-write.patch b/target/linux/ramips/patches-3.6/011-mtd-cfi_cmdset_0002-force-word-write.patch
index e60bdf5595..c4a5262f09 100644
--- a/target/linux/ramips/patches-3.6/011-mtd-cfi_cmdset_0002-force-word-write.patch
+++ b/target/linux/ramips/patches-3.6/011-mtd-cfi_cmdset_0002-force-word-write.patch
@@ -1,7 +1,5 @@
-Index: linux-3.6.6/drivers/mtd/chips/cfi_cmdset_0002.c
-===================================================================
---- linux-3.6.6.orig/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ linux-3.6.6/drivers/mtd/chips/cfi_cmdset_0002.c
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -39,7 +39,7 @@
#include <linux/mtd/xip.h>