aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120/patches-2.6.35/001-adm5120.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-12-22 17:19:36 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-12-22 17:19:36 +0000
commit22d8dcbf447f54b1a4ff0365c8a5f53736984cf0 (patch)
tree44bc4628235a7deaf2f4a1aefa4d1bb5b828e36d /target/linux/adm5120/patches-2.6.35/001-adm5120.patch
parent72ca63488b7a1efd184235509176de9526106cde (diff)
downloadupstream-22d8dcbf447f54b1a4ff0365c8a5f53736984cf0.tar.gz
upstream-22d8dcbf447f54b1a4ff0365c8a5f53736984cf0.tar.bz2
upstream-22d8dcbf447f54b1a4ff0365c8a5f53736984cf0.zip
adm5120: make patches apply again and refresh them
SVN-Revision: 24800
Diffstat (limited to 'target/linux/adm5120/patches-2.6.35/001-adm5120.patch')
-rw-r--r--target/linux/adm5120/patches-2.6.35/001-adm5120.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/adm5120/patches-2.6.35/001-adm5120.patch b/target/linux/adm5120/patches-2.6.35/001-adm5120.patch
index c6eec1e23f..c99399cb13 100644
--- a/target/linux/adm5120/patches-2.6.35/001-adm5120.patch
+++ b/target/linux/adm5120/patches-2.6.35/001-adm5120.patch
@@ -22,7 +22,7 @@
config MACH_ALCHEMY
bool "Alchemy processor based machines"
select SYS_SUPPORTS_ZBOOT
-@@ -681,6 +696,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
+@@ -683,6 +698,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
endchoice
@@ -32,7 +32,7 @@
source "arch/mips/jazz/Kconfig"
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
-@@ -214,6 +214,23 @@ cflags-$(CONFIG_MACH_JAZZ) += -I$(srctre
+@@ -227,6 +227,23 @@ cflags-$(CONFIG_MACH_JAZZ) += -I$(srctre
load-$(CONFIG_MACH_JAZZ) += 0xffffffff80080000
#