aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2014-01-26 11:30:34 +0000
committerGabor Juhos <juhosg@openwrt.org>2014-01-26 11:30:34 +0000
commitae7072b9ff7ce90a4bb2e049083a01bda5a01788 (patch)
tree4144fe28343a2b63381f331ba1b5662d0acfee2d /target/linux/ar7
parent66745cce9302826946fcdd7623130d5bf5f8dcff (diff)
downloadupstream-ae7072b9ff7ce90a4bb2e049083a01bda5a01788.tar.gz
upstream-ae7072b9ff7ce90a4bb2e049083a01bda5a01788.tar.bz2
upstream-ae7072b9ff7ce90a4bb2e049083a01bda5a01788.zip
kernel: update 3.10 to 3.10.28
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39399 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar7')
-rw-r--r--target/linux/ar7/Makefile2
-rw-r--r--target/linux/ar7/patches-3.10/110-flash.patch2
-rw-r--r--target/linux/ar7/patches-3.10/320-ac49x-mtd-partitions.patch4
3 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile
index b21604744a..e28213b88d 100644
--- a/target/linux/ar7/Makefile
+++ b/target/linux/ar7/Makefile
@@ -13,7 +13,7 @@ FEATURES:=squashfs atm
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
SUBTARGETS:=generic ac49x
-LINUX_VERSION:=3.10.26
+LINUX_VERSION:=3.10.28
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/ar7/patches-3.10/110-flash.patch b/target/linux/ar7/patches-3.10/110-flash.patch
index 18ae78bfb6..e12eec5f7d 100644
--- a/target/linux/ar7/patches-3.10/110-flash.patch
+++ b/target/linux/ar7/patches-3.10/110-flash.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
-@@ -15,7 +15,7 @@ obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o
+@@ -16,7 +16,7 @@ obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o
obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
diff --git a/target/linux/ar7/patches-3.10/320-ac49x-mtd-partitions.patch b/target/linux/ar7/patches-3.10/320-ac49x-mtd-partitions.patch
index 3bccd3e187..f74ee17c39 100644
--- a/target/linux/ar7/patches-3.10/320-ac49x-mtd-partitions.patch
+++ b/target/linux/ar7/patches-3.10/320-ac49x-mtd-partitions.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
-@@ -188,6 +188,11 @@ config MTD_OF_PARTS
+@@ -192,6 +192,11 @@ config MTD_OF_PARTS
the partition map from the children of the flash node,
as described in Documentation/devicetree/booting-without-of.txt.
@@ -14,7 +14,7 @@
---help---
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
-@@ -14,6 +14,7 @@ mtd-$(CONFIG_MTD_SPLIT_UIMAGE_FW) += mtd
+@@ -15,6 +15,7 @@ mtd-$(CONFIG_MTD_SPLIT_LZMA_FW) += mtdsp
obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o
obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o