Unbreak Octeon kernel config after r1.25 of files.mips64.

Feedback and ok miod@

3 files changed, 5 insertions, 4 deletions

diff --git a/sys/arch/octeon/conf/GENERIC b/sys/arch/octeon/conf/GENERIC
index f9c4f41b42c..8b236c7f2ae 100644
--- a/sys/arch/octeon/conf/GENERIC
+++ b/sys/arch/octeon/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.22 2015/07/20 19:44:32 pirofti Exp $
+#	$OpenBSD: GENERIC,v 1.23 2015/08/18 12:49:41 visa Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -13,6 +13,7 @@ machine		octeon mips64
 include		"../../../conf/GENERIC"
 maxusers	32
 
+option		CPU_MIPS64R2
 option		CPU_OCTEON
 option		FPUEMUL
 makeoption	LINK_ADDRESS="0xffffffff81000000"
diff --git a/sys/arch/octeon/conf/RAMDISK b/sys/arch/octeon/conf/RAMDISK
index aaf35e5f158..3a2f6ff2e67 100644
--- a/sys/arch/octeon/conf/RAMDISK
+++ b/sys/arch/octeon/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.21 2015/08/05 12:07:11 pirofti Exp $
+#	$OpenBSD: RAMDISK,v 1.22 2015/08/18 12:49:41 visa Exp $
 
 machine		octeon mips64
 maxusers	4
@@ -24,6 +24,7 @@ option		MSDOSFS
 option		NFSCLIENT
 option		INET6
 
+option		CPU_MIPS64R2
 option		CPU_OCTEON
 option		FPUEMUL
 makeoption	LINK_ADDRESS="0xffffffff81000000"
diff --git a/sys/arch/octeon/conf/files.octeon b/sys/arch/octeon/conf/files.octeon
index f2541a63a7a..9632468bb72 100644
--- a/sys/arch/octeon/conf/files.octeon
+++ b/sys/arch/octeon/conf/files.octeon
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.octeon,v 1.24 2015/07/20 19:44:32 pirofti Exp $
+#	$OpenBSD: files.octeon,v 1.25 2015/08/18 12:49:41 visa Exp $
 
 # Standard stanzas config(8) can't run without
 maxpartitions 16
@@ -19,7 +19,6 @@ file	arch/octeon/octeon/conf.c
 file	arch/octeon/octeon/disksubr.c		disk
 file	arch/octeon/octeon/lock_machdep.c	multiprocessor
 file	arch/octeon/octeon/machdep.c
-file	arch/mips64/mips64/mips64r2.S
 
 include "dev/ata/files.ata"
 include "dev/atapiscsi/files.atapiscsi"