From 4d9ac6c76fa53b44414a1acd1b900ed89bdfa6f8 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 6 Jul 2008 21:09:29 +0000
Subject: [PATCH] As discussed on IRC and at BSDcan, move the mips32/*
 directories up a level.  The distinction was artificial.  Some more movement
 around the deck charis is likely depending on the fallout from this one.

Paths were corrected after the svn mv.  Hope that's OK.
---
 sys/mips/{mips32 => }/adm5120/adm5120_machdep.c   |  0
 sys/mips/{mips32 => }/adm5120/adm5120reg.h        |  0
 sys/mips/{mips32 => }/adm5120/admpci.c            |  0
 sys/mips/{mips32 => }/adm5120/console.c           |  0
 sys/mips/adm5120/files.adm5120                    | 11 +++++++++++
 sys/mips/{mips32 => }/adm5120/if_admsw.c          |  0
 sys/mips/{mips32 => }/adm5120/if_admswreg.h       |  0
 sys/mips/{mips32 => }/adm5120/if_admswvar.h       |  0
 sys/mips/{mips32 => }/adm5120/obio.c              |  0
 sys/mips/{mips32 => }/adm5120/obiovar.h           |  0
 sys/mips/{mips32 => }/adm5120/std.adm5120         |  0
 sys/mips/{mips32 => }/adm5120/uart_bus_adm5120.c  |  0
 sys/mips/{mips32 => }/adm5120/uart_cpu_adm5120.c  |  0
 sys/mips/{mips32 => }/adm5120/uart_dev_adm5120.c  |  0
 sys/mips/{mips32 => }/adm5120/uart_dev_adm5120.h  |  0
 sys/mips/idt/files.idt                            |  8 ++++++++
 sys/mips/{mips32 => }/idt/idt_machdep.c           |  0
 sys/mips/{mips32 => }/idt/idtpci.c                |  0
 sys/mips/{mips32 => }/idt/idtreg.h                |  0
 sys/mips/{mips32 => }/idt/if_kr.c                 |  0
 sys/mips/{mips32 => }/idt/if_krreg.h              |  0
 sys/mips/{mips32 => }/idt/obio.c                  |  0
 sys/mips/{mips32 => }/idt/obiovar.h               |  0
 sys/mips/{mips32 => }/idt/std.idt                 |  0
 sys/mips/{mips32 => }/idt/uart_bus_rc32434.c      |  0
 sys/mips/{mips32 => }/idt/uart_cpu_rc32434.c      |  0
 sys/mips/malta/files.malta                        |  9 +++++++++
 sys/mips/{mips32 => }/malta/gt.c                  |  0
 sys/mips/{mips32 => }/malta/gt_pci.c              |  0
 sys/mips/{mips32 => }/malta/gtreg.h               |  0
 sys/mips/{mips32 => }/malta/gtvar.h               |  0
 sys/mips/{mips32 => }/malta/malta_machdep.c       |  0
 sys/mips/{mips32 => }/malta/maltareg.h            |  0
 sys/mips/{mips32 => }/malta/obio.c                |  0
 sys/mips/{mips32 => }/malta/obiovar.h             |  0
 sys/mips/{mips32 => }/malta/std.malta             |  0
 sys/mips/{mips32 => }/malta/uart_bus_maltausart.c |  0
 sys/mips/{mips32 => }/malta/uart_cpu_maltausart.c |  0
 sys/mips/{mips32 => }/malta/yamon.c               |  0
 sys/mips/{mips32 => }/malta/yamon.h               |  0
 sys/mips/mips32/adm5120/files.adm5120             | 11 -----------
 sys/mips/mips32/idt/files.idt                     |  8 --------
 sys/mips/mips32/malta/files.malta                 |  9 ---------
 sys/mips/{mips32 => }/sentry5/files.sentry5       |  6 +++---
 sys/mips/{mips32 => }/sentry5/obio.c              |  0
 sys/mips/{mips32 => }/sentry5/obiovar.h           |  0
 sys/mips/{mips32 => }/sentry5/s5_machdep.c        |  0
 sys/mips/{mips32 => }/sentry5/s5reg.h             |  0
 sys/mips/{mips32 => }/sentry5/siba_cc.c           |  0
 sys/mips/{mips32 => }/sentry5/siba_mips.c         |  0
 sys/mips/{mips32 => }/sentry5/siba_sdram.c        |  0
 sys/mips/{mips32 => }/sentry5/uart_bus_sbusart.c  |  0
 sys/mips/{mips32 => }/sentry5/uart_cpu_sbusart.c  |  0
 53 files changed, 31 insertions(+), 31 deletions(-)
 rename sys/mips/{mips32 => }/adm5120/adm5120_machdep.c (100%)
 rename sys/mips/{mips32 => }/adm5120/adm5120reg.h (100%)
 rename sys/mips/{mips32 => }/adm5120/admpci.c (100%)
 rename sys/mips/{mips32 => }/adm5120/console.c (100%)
 create mode 100644 sys/mips/adm5120/files.adm5120
 rename sys/mips/{mips32 => }/adm5120/if_admsw.c (100%)
 rename sys/mips/{mips32 => }/adm5120/if_admswreg.h (100%)
 rename sys/mips/{mips32 => }/adm5120/if_admswvar.h (100%)
 rename sys/mips/{mips32 => }/adm5120/obio.c (100%)
 rename sys/mips/{mips32 => }/adm5120/obiovar.h (100%)
 rename sys/mips/{mips32 => }/adm5120/std.adm5120 (100%)
 rename sys/mips/{mips32 => }/adm5120/uart_bus_adm5120.c (100%)
 rename sys/mips/{mips32 => }/adm5120/uart_cpu_adm5120.c (100%)
 rename sys/mips/{mips32 => }/adm5120/uart_dev_adm5120.c (100%)
 rename sys/mips/{mips32 => }/adm5120/uart_dev_adm5120.h (100%)
 create mode 100644 sys/mips/idt/files.idt
 rename sys/mips/{mips32 => }/idt/idt_machdep.c (100%)
 rename sys/mips/{mips32 => }/idt/idtpci.c (100%)
 rename sys/mips/{mips32 => }/idt/idtreg.h (100%)
 rename sys/mips/{mips32 => }/idt/if_kr.c (100%)
 rename sys/mips/{mips32 => }/idt/if_krreg.h (100%)
 rename sys/mips/{mips32 => }/idt/obio.c (100%)
 rename sys/mips/{mips32 => }/idt/obiovar.h (100%)
 rename sys/mips/{mips32 => }/idt/std.idt (100%)
 rename sys/mips/{mips32 => }/idt/uart_bus_rc32434.c (100%)
 rename sys/mips/{mips32 => }/idt/uart_cpu_rc32434.c (100%)
 create mode 100644 sys/mips/malta/files.malta
 rename sys/mips/{mips32 => }/malta/gt.c (100%)
 rename sys/mips/{mips32 => }/malta/gt_pci.c (100%)
 rename sys/mips/{mips32 => }/malta/gtreg.h (100%)
 rename sys/mips/{mips32 => }/malta/gtvar.h (100%)
 rename sys/mips/{mips32 => }/malta/malta_machdep.c (100%)
 rename sys/mips/{mips32 => }/malta/maltareg.h (100%)
 rename sys/mips/{mips32 => }/malta/obio.c (100%)
 rename sys/mips/{mips32 => }/malta/obiovar.h (100%)
 rename sys/mips/{mips32 => }/malta/std.malta (100%)
 rename sys/mips/{mips32 => }/malta/uart_bus_maltausart.c (100%)
 rename sys/mips/{mips32 => }/malta/uart_cpu_maltausart.c (100%)
 rename sys/mips/{mips32 => }/malta/yamon.c (100%)
 rename sys/mips/{mips32 => }/malta/yamon.h (100%)
 delete mode 100644 sys/mips/mips32/adm5120/files.adm5120
 delete mode 100644 sys/mips/mips32/idt/files.idt
 delete mode 100644 sys/mips/mips32/malta/files.malta
 rename sys/mips/{mips32 => }/sentry5/files.sentry5 (69%)
 rename sys/mips/{mips32 => }/sentry5/obio.c (100%)
 rename sys/mips/{mips32 => }/sentry5/obiovar.h (100%)
 rename sys/mips/{mips32 => }/sentry5/s5_machdep.c (100%)
 rename sys/mips/{mips32 => }/sentry5/s5reg.h (100%)
 rename sys/mips/{mips32 => }/sentry5/siba_cc.c (100%)
 rename sys/mips/{mips32 => }/sentry5/siba_mips.c (100%)
 rename sys/mips/{mips32 => }/sentry5/siba_sdram.c (100%)
 rename sys/mips/{mips32 => }/sentry5/uart_bus_sbusart.c (100%)
 rename sys/mips/{mips32 => }/sentry5/uart_cpu_sbusart.c (100%)

diff --git a/sys/mips/mips32/adm5120/adm5120_machdep.c b/sys/mips/adm5120/adm5120_machdep.c
similarity index 100%
rename from sys/mips/mips32/adm5120/adm5120_machdep.c
rename to sys/mips/adm5120/adm5120_machdep.c
diff --git a/sys/mips/mips32/adm5120/adm5120reg.h b/sys/mips/adm5120/adm5120reg.h
similarity index 100%
rename from sys/mips/mips32/adm5120/adm5120reg.h
rename to sys/mips/adm5120/adm5120reg.h
diff --git a/sys/mips/mips32/adm5120/admpci.c b/sys/mips/adm5120/admpci.c
similarity index 100%
rename from sys/mips/mips32/adm5120/admpci.c
rename to sys/mips/adm5120/admpci.c
diff --git a/sys/mips/mips32/adm5120/console.c b/sys/mips/adm5120/console.c
similarity index 100%
rename from sys/mips/mips32/adm5120/console.c
rename to sys/mips/adm5120/console.c
diff --git a/sys/mips/adm5120/files.adm5120 b/sys/mips/adm5120/files.adm5120
new file mode 100644
index 000000000000..489ea733ba25
--- /dev/null
+++ b/sys/mips/adm5120/files.adm5120
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+# ADM5120 on-board devices
+# mips/adm5120/console.c		standard
+mips/adm5120/adm5120_machdep.c	standard
+mips/adm5120/admpci.c		optional admpci
+mips/adm5120/if_admsw.c		optional admsw
+mips/adm5120/obio.c		standard
+mips/adm5120/uart_bus_adm5120.c	optional uart
+mips/adm5120/uart_cpu_adm5120.c	optional uart
+mips/adm5120/uart_dev_adm5120.c	optional uart
diff --git a/sys/mips/mips32/adm5120/if_admsw.c b/sys/mips/adm5120/if_admsw.c
similarity index 100%
rename from sys/mips/mips32/adm5120/if_admsw.c
rename to sys/mips/adm5120/if_admsw.c
diff --git a/sys/mips/mips32/adm5120/if_admswreg.h b/sys/mips/adm5120/if_admswreg.h
similarity index 100%
rename from sys/mips/mips32/adm5120/if_admswreg.h
rename to sys/mips/adm5120/if_admswreg.h
diff --git a/sys/mips/mips32/adm5120/if_admswvar.h b/sys/mips/adm5120/if_admswvar.h
similarity index 100%
rename from sys/mips/mips32/adm5120/if_admswvar.h
rename to sys/mips/adm5120/if_admswvar.h
diff --git a/sys/mips/mips32/adm5120/obio.c b/sys/mips/adm5120/obio.c
similarity index 100%
rename from sys/mips/mips32/adm5120/obio.c
rename to sys/mips/adm5120/obio.c
diff --git a/sys/mips/mips32/adm5120/obiovar.h b/sys/mips/adm5120/obiovar.h
similarity index 100%
rename from sys/mips/mips32/adm5120/obiovar.h
rename to sys/mips/adm5120/obiovar.h
diff --git a/sys/mips/mips32/adm5120/std.adm5120 b/sys/mips/adm5120/std.adm5120
similarity index 100%
rename from sys/mips/mips32/adm5120/std.adm5120
rename to sys/mips/adm5120/std.adm5120
diff --git a/sys/mips/mips32/adm5120/uart_bus_adm5120.c b/sys/mips/adm5120/uart_bus_adm5120.c
similarity index 100%
rename from sys/mips/mips32/adm5120/uart_bus_adm5120.c
rename to sys/mips/adm5120/uart_bus_adm5120.c
diff --git a/sys/mips/mips32/adm5120/uart_cpu_adm5120.c b/sys/mips/adm5120/uart_cpu_adm5120.c
similarity index 100%
rename from sys/mips/mips32/adm5120/uart_cpu_adm5120.c
rename to sys/mips/adm5120/uart_cpu_adm5120.c
diff --git a/sys/mips/mips32/adm5120/uart_dev_adm5120.c b/sys/mips/adm5120/uart_dev_adm5120.c
similarity index 100%
rename from sys/mips/mips32/adm5120/uart_dev_adm5120.c
rename to sys/mips/adm5120/uart_dev_adm5120.c
diff --git a/sys/mips/mips32/adm5120/uart_dev_adm5120.h b/sys/mips/adm5120/uart_dev_adm5120.h
similarity index 100%
rename from sys/mips/mips32/adm5120/uart_dev_adm5120.h
rename to sys/mips/adm5120/uart_dev_adm5120.h
diff --git a/sys/mips/idt/files.idt b/sys/mips/idt/files.idt
new file mode 100644
index 000000000000..370ccf940670
--- /dev/null
+++ b/sys/mips/idt/files.idt
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+mips/idt/idt_machdep.c		standard
+mips/idt/idtpci.c		optional pci
+mips/idt/if_kr.c			optional kr
+mips/idt/obio.c			standard
+mips/idt/uart_cpu_rc32434.c	optional uart
+mips/idt/uart_bus_rc32434.c	optional uart
diff --git a/sys/mips/mips32/idt/idt_machdep.c b/sys/mips/idt/idt_machdep.c
similarity index 100%
rename from sys/mips/mips32/idt/idt_machdep.c
rename to sys/mips/idt/idt_machdep.c
diff --git a/sys/mips/mips32/idt/idtpci.c b/sys/mips/idt/idtpci.c
similarity index 100%
rename from sys/mips/mips32/idt/idtpci.c
rename to sys/mips/idt/idtpci.c
diff --git a/sys/mips/mips32/idt/idtreg.h b/sys/mips/idt/idtreg.h
similarity index 100%
rename from sys/mips/mips32/idt/idtreg.h
rename to sys/mips/idt/idtreg.h
diff --git a/sys/mips/mips32/idt/if_kr.c b/sys/mips/idt/if_kr.c
similarity index 100%
rename from sys/mips/mips32/idt/if_kr.c
rename to sys/mips/idt/if_kr.c
diff --git a/sys/mips/mips32/idt/if_krreg.h b/sys/mips/idt/if_krreg.h
similarity index 100%
rename from sys/mips/mips32/idt/if_krreg.h
rename to sys/mips/idt/if_krreg.h
diff --git a/sys/mips/mips32/idt/obio.c b/sys/mips/idt/obio.c
similarity index 100%
rename from sys/mips/mips32/idt/obio.c
rename to sys/mips/idt/obio.c
diff --git a/sys/mips/mips32/idt/obiovar.h b/sys/mips/idt/obiovar.h
similarity index 100%
rename from sys/mips/mips32/idt/obiovar.h
rename to sys/mips/idt/obiovar.h
diff --git a/sys/mips/mips32/idt/std.idt b/sys/mips/idt/std.idt
similarity index 100%
rename from sys/mips/mips32/idt/std.idt
rename to sys/mips/idt/std.idt
diff --git a/sys/mips/mips32/idt/uart_bus_rc32434.c b/sys/mips/idt/uart_bus_rc32434.c
similarity index 100%
rename from sys/mips/mips32/idt/uart_bus_rc32434.c
rename to sys/mips/idt/uart_bus_rc32434.c
diff --git a/sys/mips/mips32/idt/uart_cpu_rc32434.c b/sys/mips/idt/uart_cpu_rc32434.c
similarity index 100%
rename from sys/mips/mips32/idt/uart_cpu_rc32434.c
rename to sys/mips/idt/uart_cpu_rc32434.c
diff --git a/sys/mips/malta/files.malta b/sys/mips/malta/files.malta
new file mode 100644
index 000000000000..14bcac1573d3
--- /dev/null
+++ b/sys/mips/malta/files.malta
@@ -0,0 +1,9 @@
+# $FreeBSD$
+mips/malta/gt.c				standard
+mips/malta/gt_pci.c			standard
+mips/malta/obio.c			optional uart
+mips/malta/uart_cpu_maltausart.c		optional uart
+mips/malta/uart_bus_maltausart.c		optional uart
+dev/uart/uart_dev_ns8250.c                      optional uart
+mips/malta/malta_machdep.c		standard
+mips/malta/yamon.c			standard
diff --git a/sys/mips/mips32/malta/gt.c b/sys/mips/malta/gt.c
similarity index 100%
rename from sys/mips/mips32/malta/gt.c
rename to sys/mips/malta/gt.c
diff --git a/sys/mips/mips32/malta/gt_pci.c b/sys/mips/malta/gt_pci.c
similarity index 100%
rename from sys/mips/mips32/malta/gt_pci.c
rename to sys/mips/malta/gt_pci.c
diff --git a/sys/mips/mips32/malta/gtreg.h b/sys/mips/malta/gtreg.h
similarity index 100%
rename from sys/mips/mips32/malta/gtreg.h
rename to sys/mips/malta/gtreg.h
diff --git a/sys/mips/mips32/malta/gtvar.h b/sys/mips/malta/gtvar.h
similarity index 100%
rename from sys/mips/mips32/malta/gtvar.h
rename to sys/mips/malta/gtvar.h
diff --git a/sys/mips/mips32/malta/malta_machdep.c b/sys/mips/malta/malta_machdep.c
similarity index 100%
rename from sys/mips/mips32/malta/malta_machdep.c
rename to sys/mips/malta/malta_machdep.c
diff --git a/sys/mips/mips32/malta/maltareg.h b/sys/mips/malta/maltareg.h
similarity index 100%
rename from sys/mips/mips32/malta/maltareg.h
rename to sys/mips/malta/maltareg.h
diff --git a/sys/mips/mips32/malta/obio.c b/sys/mips/malta/obio.c
similarity index 100%
rename from sys/mips/mips32/malta/obio.c
rename to sys/mips/malta/obio.c
diff --git a/sys/mips/mips32/malta/obiovar.h b/sys/mips/malta/obiovar.h
similarity index 100%
rename from sys/mips/mips32/malta/obiovar.h
rename to sys/mips/malta/obiovar.h
diff --git a/sys/mips/mips32/malta/std.malta b/sys/mips/malta/std.malta
similarity index 100%
rename from sys/mips/mips32/malta/std.malta
rename to sys/mips/malta/std.malta
diff --git a/sys/mips/mips32/malta/uart_bus_maltausart.c b/sys/mips/malta/uart_bus_maltausart.c
similarity index 100%
rename from sys/mips/mips32/malta/uart_bus_maltausart.c
rename to sys/mips/malta/uart_bus_maltausart.c
diff --git a/sys/mips/mips32/malta/uart_cpu_maltausart.c b/sys/mips/malta/uart_cpu_maltausart.c
similarity index 100%
rename from sys/mips/mips32/malta/uart_cpu_maltausart.c
rename to sys/mips/malta/uart_cpu_maltausart.c
diff --git a/sys/mips/mips32/malta/yamon.c b/sys/mips/malta/yamon.c
similarity index 100%
rename from sys/mips/mips32/malta/yamon.c
rename to sys/mips/malta/yamon.c
diff --git a/sys/mips/mips32/malta/yamon.h b/sys/mips/malta/yamon.h
similarity index 100%
rename from sys/mips/mips32/malta/yamon.h
rename to sys/mips/malta/yamon.h
diff --git a/sys/mips/mips32/adm5120/files.adm5120 b/sys/mips/mips32/adm5120/files.adm5120
deleted file mode 100644
index 31b92c8c634e..000000000000
--- a/sys/mips/mips32/adm5120/files.adm5120
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-# ADM5120 on-board devices
-# mips/mips32/adm5120/console.c		standard
-mips/mips32/adm5120/adm5120_machdep.c	standard
-mips/mips32/adm5120/admpci.c		optional admpci
-mips/mips32/adm5120/if_admsw.c		optional admsw
-mips/mips32/adm5120/obio.c		standard
-mips/mips32/adm5120/uart_bus_adm5120.c	optional uart
-mips/mips32/adm5120/uart_cpu_adm5120.c	optional uart
-mips/mips32/adm5120/uart_dev_adm5120.c	optional uart
diff --git a/sys/mips/mips32/idt/files.idt b/sys/mips/mips32/idt/files.idt
deleted file mode 100644
index 2782edc1c28b..000000000000
--- a/sys/mips/mips32/idt/files.idt
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-mips/mips32/idt/idt_machdep.c		standard
-mips/mips32/idt/idtpci.c		optional pci
-mips/mips32/idt/if_kr.c			optional kr
-mips/mips32/idt/obio.c			standard
-mips/mips32/idt/uart_cpu_rc32434.c	optional uart
-mips/mips32/idt/uart_bus_rc32434.c	optional uart
diff --git a/sys/mips/mips32/malta/files.malta b/sys/mips/mips32/malta/files.malta
deleted file mode 100644
index 04b46ef0bab7..000000000000
--- a/sys/mips/mips32/malta/files.malta
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-mips/mips32/malta/gt.c				standard
-mips/mips32/malta/gt_pci.c			standard
-mips/mips32/malta/obio.c			optional uart
-mips/mips32/malta/uart_cpu_maltausart.c		optional uart
-mips/mips32/malta/uart_bus_maltausart.c		optional uart
-dev/uart/uart_dev_ns8250.c                      optional uart
-mips/mips32/malta/malta_machdep.c		standard
-mips/mips32/malta/yamon.c			standard
diff --git a/sys/mips/mips32/sentry5/files.sentry5 b/sys/mips/sentry5/files.sentry5
similarity index 69%
rename from sys/mips/mips32/sentry5/files.sentry5
rename to sys/mips/sentry5/files.sentry5
index db3523235de0..61038e035df9 100644
--- a/sys/mips/mips32/sentry5/files.sentry5
+++ b/sys/mips/sentry5/files.sentry5
@@ -5,10 +5,10 @@
 # which are believed to be devices we have drivers for
 # which just need to be tweaked for attachment to an SSB system bus.
 
-mips/mips32/sentry5/s5_machdep.c		standard
+mips/sentry5/s5_machdep.c		standard
 dev/siba/siba.c					optional siba
 dev/siba/siba_pcib.c				optional siba pci
-mips/mips32/sentry5/siba_cc.c			optional siba
+mips/sentry5/siba_cc.c			optional siba
 
 # notyet
-#mips/mips32/sentry5/siba_mips.c			optional siba
+#mips/sentry5/siba_mips.c			optional siba
diff --git a/sys/mips/mips32/sentry5/obio.c b/sys/mips/sentry5/obio.c
similarity index 100%
rename from sys/mips/mips32/sentry5/obio.c
rename to sys/mips/sentry5/obio.c
diff --git a/sys/mips/mips32/sentry5/obiovar.h b/sys/mips/sentry5/obiovar.h
similarity index 100%
rename from sys/mips/mips32/sentry5/obiovar.h
rename to sys/mips/sentry5/obiovar.h
diff --git a/sys/mips/mips32/sentry5/s5_machdep.c b/sys/mips/sentry5/s5_machdep.c
similarity index 100%
rename from sys/mips/mips32/sentry5/s5_machdep.c
rename to sys/mips/sentry5/s5_machdep.c
diff --git a/sys/mips/mips32/sentry5/s5reg.h b/sys/mips/sentry5/s5reg.h
similarity index 100%
rename from sys/mips/mips32/sentry5/s5reg.h
rename to sys/mips/sentry5/s5reg.h
diff --git a/sys/mips/mips32/sentry5/siba_cc.c b/sys/mips/sentry5/siba_cc.c
similarity index 100%
rename from sys/mips/mips32/sentry5/siba_cc.c
rename to sys/mips/sentry5/siba_cc.c
diff --git a/sys/mips/mips32/sentry5/siba_mips.c b/sys/mips/sentry5/siba_mips.c
similarity index 100%
rename from sys/mips/mips32/sentry5/siba_mips.c
rename to sys/mips/sentry5/siba_mips.c
diff --git a/sys/mips/mips32/sentry5/siba_sdram.c b/sys/mips/sentry5/siba_sdram.c
similarity index 100%
rename from sys/mips/mips32/sentry5/siba_sdram.c
rename to sys/mips/sentry5/siba_sdram.c
diff --git a/sys/mips/mips32/sentry5/uart_bus_sbusart.c b/sys/mips/sentry5/uart_bus_sbusart.c
similarity index 100%
rename from sys/mips/mips32/sentry5/uart_bus_sbusart.c
rename to sys/mips/sentry5/uart_bus_sbusart.c
diff --git a/sys/mips/mips32/sentry5/uart_cpu_sbusart.c b/sys/mips/sentry5/uart_cpu_sbusart.c
similarity index 100%
rename from sys/mips/mips32/sentry5/uart_cpu_sbusart.c
rename to sys/mips/sentry5/uart_cpu_sbusart.c