-Index: linux-2.6.33/arch/mips/Makefile
-===================================================================
---- linux-2.6.33.orig/arch/mips/Makefile 2010-02-28 16:43:15.000000000 +0100
-+++ linux-2.6.33/arch/mips/Makefile 2010-02-28 16:45:56.397211344 +0100
-@@ -637,6 +637,13 @@
- load-$(CONFIG_CPU_CAVIUM_OCTEON) += 0xffffffff81100000
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -166,6 +166,13 @@ ifeq (,$(findstring march=octeon, $(cfla
+ cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -Wa,-march=octeon
endif
+#
+cflags-$(CONFIG_ATHEROS_AR71XX) += -I$(srctree)/arch/mips/include/asm/mach-ar71xx
+load-$(CONFIG_ATHEROS_AR71XX) += 0xffffffff80060000
+
- # temporary until string.h is fixed
- cflags-y += -ffreestanding
-
-Index: linux-2.6.33/arch/mips/Kconfig
-===================================================================
---- linux-2.6.33.orig/arch/mips/Kconfig 2010-02-28 16:43:15.000000000 +0100
-+++ linux-2.6.33/arch/mips/Kconfig 2010-02-28 16:46:56.150331076 +0100
-@@ -48,6 +48,23 @@
+ cflags-$(CONFIG_CPU_R4000_WORKAROUNDS) += $(call cc-option,-mfix-r4000,)
+ cflags-$(CONFIG_CPU_R4400_WORKAROUNDS) += $(call cc-option,-mfix-r4400,)
+ cflags-$(CONFIG_CPU_DADDI_WORKAROUNDS) += $(call cc-option,-mno-daddi,)
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -48,6 +48,23 @@ config AR7
Support for the Texas Instruments AR7 System-on-a-Chip
family: TNETD7100, 7200 and 7300.
config BCM47XX
bool "BCM47XX based boards"
select CEVT_R4K
-@@ -682,6 +699,7 @@
+@@ -682,6 +699,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
endchoice
source "arch/mips/alchemy/Kconfig"