aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120/patches-2.6.34/001-adm5120.patch
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-04-28 09:28:13 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-04-28 09:28:13 +0000
commit4c78fa04922c0a12613b607a814397ab3071bc68 (patch)
tree7b975fba4e7d055e6c57a5d1e84a6da09c7726e4 /target/linux/adm5120/patches-2.6.34/001-adm5120.patch
parentee7569f3e5282c1cca047f55ef6bf22183cdce87 (diff)
downloadupstream-4c78fa04922c0a12613b607a814397ab3071bc68.tar.gz
upstream-4c78fa04922c0a12613b607a814397ab3071bc68.tar.bz2
upstream-4c78fa04922c0a12613b607a814397ab3071bc68.zip
refresh kernel patches
SVN-Revision: 21218
Diffstat (limited to 'target/linux/adm5120/patches-2.6.34/001-adm5120.patch')
-rw-r--r--target/linux/adm5120/patches-2.6.34/001-adm5120.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/adm5120/patches-2.6.34/001-adm5120.patch b/target/linux/adm5120/patches-2.6.34/001-adm5120.patch
index 5a5750bac7..e165b04685 100644
--- a/target/linux/adm5120/patches-2.6.34/001-adm5120.patch
+++ b/target/linux/adm5120/patches-2.6.34/001-adm5120.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -20,6 +20,21 @@ choice
+@@ -23,6 +23,21 @@ choice
prompt "System type"
default SGI_IP22
@@ -21,18 +21,18 @@
+
config MACH_ALCHEMY
bool "Alchemy processor based machines"
-
-@@ -673,6 +688,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
+ select SYS_SUPPORTS_ZBOOT
+@@ -681,6 +696,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
endchoice
+source "arch/mips/adm5120/Kconfig"
source "arch/mips/alchemy/Kconfig"
- source "arch/mips/basler/excite/Kconfig"
source "arch/mips/bcm63xx/Kconfig"
+ source "arch/mips/jazz/Kconfig"
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
-@@ -191,6 +191,22 @@ cflags-$(CONFIG_MACH_JAZZ) += -I$(srctre
+@@ -214,6 +214,22 @@ cflags-$(CONFIG_MACH_JAZZ) += -I$(srctre
load-$(CONFIG_MACH_JAZZ) += 0xffffffff80080000
#