summaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120/patches-2.6.34/001-adm5120.patch
diff options
context:
space:
mode:
authoracoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-28 09:28:13 +0000
committeracoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-28 09:28:13 +0000
commitb94d47a36de418ed22b58d739dd6de907db77a8f (patch)
tree41ee67dfb71c319841928df18c3cf2c904427a8d /target/linux/adm5120/patches-2.6.34/001-adm5120.patch
parentef1937b12e3a48beb2c6e545fa95490c0c46d590 (diff)
[adm5120] refresh kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21218 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 5a5750bac..e165b0468 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
#