5 files changed, 7 insertions, 5 deletions
diff --git a/sys/mips/adm5120/std.adm5120 b/sys/mips/adm5120/std.adm5120
index 5c96cd3..59bf118 100644
--- a/sys/mips/adm5120/std.adm5120
+++ b/sys/mips/adm5120/std.adm5120
@@ -1,8 +1,9 @@
 # $FreeBSD$
 # Standard include file for ADM5120
 
+files	"../adm5120/files.adm5120"
+
 cpu		CPU_MIPS4KC
-files		"../mips32/adm5120/files.adm5120"
 options		ISA_MIPS32
 
 # device		admpci
diff --git a/sys/mips/conf/ADM5120 b/sys/mips/conf/ADM5120
index 97cae0f..e1b3a71 100644
--- a/sys/mips/conf/ADM5120
+++ b/sys/mips/conf/ADM5120
@@ -27,7 +27,7 @@ makeoptions	MIPS_LITTLE_ENDIAN=defined
 makeoptions	MODULES_OVERRIDE=""
 
 options		KERNVIRTADDR=0x80100000
-include		"../mips32/adm5120/std.adm5120"
+include		"../adm5120/std.adm5120"
 
 hints		"ADM5120.hints"		#Default places to look for devices.
 
diff --git a/sys/mips/conf/IDT b/sys/mips/conf/IDT
index 44f9dcb..c4c3ca2 100644
--- a/sys/mips/conf/IDT
+++ b/sys/mips/conf/IDT
@@ -7,7 +7,7 @@ ident		RB532
 # Don't build any modules yet.
 makeoptions	MODULES_OVERRIDE=""
 
-include		"../mips32/idt/std.idt"
+include		"../idt/std.idt"
 hints		"IDT.hints"		#Default places to look for devices.
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
diff --git a/sys/mips/conf/SENTRY5 b/sys/mips/conf/SENTRY5
index ac372ea..b8195c5 100644
--- a/sys/mips/conf/SENTRY5
+++ b/sys/mips/conf/SENTRY5
@@ -34,7 +34,7 @@ options		CPU_SENTRY5			# XXX should this be a
 
 # XXX only siba should be hardwired for now; we will use
 # bus enumeration there
-files		"../mips32/sentry5/files.sentry5"
+files		"../sentry5/files.sentry5"
 hints		"SENTRY5.hints"
 
 # sentry5 normally ships with cfe firmware; use the console for now
diff --git a/sys/mips/idt/std.idt b/sys/mips/idt/std.idt
index fa067e7..e40f4a4 100644
--- a/sys/mips/idt/std.idt
+++ b/sys/mips/idt/std.idt
@@ -1,5 +1,6 @@
 # $FreeBSD$
 # Standard include file for IDT
 
-files           "../mips32/idt/files.idt"
+files	"../idt/files.idt"
+
 options		ISA_MIPS32