aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-2.6.29
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-06-06 06:32:41 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-06-06 06:32:41 +0000
commit7077028d457b339db9044ce06f74d0c1ce5c7b7c (patch)
treef364ca1c6a73f6da433e7312cce9ec722ad7b49f /target/linux/ar71xx/patches-2.6.29
parent91aa0a7ca07219c2fef2686789813d98ad53b2f2 (diff)
downloadupstream-7077028d457b339db9044ce06f74d0c1ce5c7b7c.tar.gz
upstream-7077028d457b339db9044ce06f74d0c1ce5c7b7c.tar.bz2
upstream-7077028d457b339db9044ce06f74d0c1ce5c7b7c.zip
sync kernel config, and refresh patches
SVN-Revision: 16352
Diffstat (limited to 'target/linux/ar71xx/patches-2.6.29')
-rw-r--r--target/linux/ar71xx/patches-2.6.29/001-ar71xx_core.patch2
-rw-r--r--target/linux/ar71xx/patches-2.6.29/300-mips_fw_myloader.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar71xx/patches-2.6.29/001-ar71xx_core.patch b/target/linux/ar71xx/patches-2.6.29/001-ar71xx_core.patch
index da6d2e79eb..4310956667 100644
--- a/target/linux/ar71xx/patches-2.6.29/001-ar71xx_core.patch
+++ b/target/linux/ar71xx/patches-2.6.29/001-ar71xx_core.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
-@@ -602,6 +602,13 @@ else
+@@ -609,6 +609,13 @@ else
load-$(CONFIG_CPU_CAVIUM_OCTEON) += 0xffffffff81100000
endif
diff --git a/target/linux/ar71xx/patches-2.6.29/300-mips_fw_myloader.patch b/target/linux/ar71xx/patches-2.6.29/300-mips_fw_myloader.patch
index db0c4b21d2..25c7e3e10c 100644
--- a/target/linux/ar71xx/patches-2.6.29/300-mips_fw_myloader.patch
+++ b/target/linux/ar71xx/patches-2.6.29/300-mips_fw_myloader.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
-@@ -164,6 +164,7 @@ endif
+@@ -171,6 +171,7 @@ endif
#
libs-$(CONFIG_ARC) += arch/mips/fw/arc/
libs-$(CONFIG_CFE) += arch/mips/fw/cfe/