summaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-09-26 18:46:53 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-09-26 18:46:53 +0000
commit151259743b7854bcf3ff9970a71ec26afd31a7e1 (patch)
tree3901f728cb521f0084dd9bf77caa05470b980387 /target/linux/ar71xx
parentae64582e5ce94230efc857d8a349115b789f366e (diff)
[kernel] update to 2.6.26.5 and 2.6.25.17
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12718 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx')
-rw-r--r--target/linux/ar71xx/Makefile2
-rw-r--r--target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile
index 1572c8431..b3353f7d3 100644
--- a/target/linux/ar71xx/Makefile
+++ b/target/linux/ar71xx/Makefile
@@ -11,7 +11,7 @@ BOARD:=ar71xx
BOARDNAME:=Atheros AR71xx
FEATURES:=squashfs tgz broken
-LINUX_VERSION:=2.6.26.3
+LINUX_VERSION:=2.6.26.5
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch b/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch
index ca989adea..a1e82808c 100644
--- a/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch
+++ b/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch
@@ -131,7 +131,7 @@
source "arch/mips/au1000/Kconfig"
source "arch/mips/basler/excite/Kconfig"
source "arch/mips/jazz/Kconfig"
-@@ -876,6 +877,9 @@
+@@ -879,6 +880,9 @@
config SYNC_R4K
bool