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.

53 files changed, 31 insertions, 31 deletions

diff --git a/sys/mips/mips32/adm5120/adm5120_machdep.c b/sys/mips/adm5120/adm5120_machdep.c
index eca9b18ae0da..eca9b18ae0da 100644
--- a/sys/mips/mips32/adm5120/adm5120_machdep.c
+++ b/sys/mips/adm5120/adm5120_machdep.c
diff --git a/sys/mips/mips32/adm5120/adm5120reg.h b/sys/mips/adm5120/adm5120reg.h
index 2f15e4675233..2f15e4675233 100644
--- a/sys/mips/mips32/adm5120/adm5120reg.h
+++ b/sys/mips/adm5120/adm5120reg.h
diff --git a/sys/mips/mips32/adm5120/admpci.c b/sys/mips/adm5120/admpci.c
index 741a2fa46d63..741a2fa46d63 100644
--- a/sys/mips/mips32/adm5120/admpci.c
+++ b/sys/mips/adm5120/admpci.c
diff --git a/sys/mips/mips32/adm5120/console.c b/sys/mips/adm5120/console.c
index 899aa5b762a2..899aa5b762a2 100644
--- a/sys/mips/mips32/adm5120/console.c
+++ b/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
index c6f57e5d4f28..c6f57e5d4f28 100644
--- a/sys/mips/mips32/adm5120/if_admsw.c
+++ b/sys/mips/adm5120/if_admsw.c
diff --git a/sys/mips/mips32/adm5120/if_admswreg.h b/sys/mips/adm5120/if_admswreg.h
index a4cfa338e06b..a4cfa338e06b 100644
--- a/sys/mips/mips32/adm5120/if_admswreg.h
+++ b/sys/mips/adm5120/if_admswreg.h
diff --git a/sys/mips/mips32/adm5120/if_admswvar.h b/sys/mips/adm5120/if_admswvar.h
index ea252885972d..ea252885972d 100644
--- a/sys/mips/mips32/adm5120/if_admswvar.h
+++ b/sys/mips/adm5120/if_admswvar.h
diff --git a/sys/mips/mips32/adm5120/obio.c b/sys/mips/adm5120/obio.c
index e4ca26403bd4..e4ca26403bd4 100644
--- a/sys/mips/mips32/adm5120/obio.c
+++ b/sys/mips/adm5120/obio.c
diff --git a/sys/mips/mips32/adm5120/obiovar.h b/sys/mips/adm5120/obiovar.h
index f09972c6b71e..f09972c6b71e 100644
--- a/sys/mips/mips32/adm5120/obiovar.h
+++ b/sys/mips/adm5120/obiovar.h
diff --git a/sys/mips/mips32/adm5120/std.adm5120 b/sys/mips/adm5120/std.adm5120
index 5c96cd31cee4..5c96cd31cee4 100644
--- a/sys/mips/mips32/adm5120/std.adm5120
+++ b/sys/mips/adm5120/std.adm5120
diff --git a/sys/mips/mips32/adm5120/uart_bus_adm5120.c b/sys/mips/adm5120/uart_bus_adm5120.c
index b3b7b67dd5d8..b3b7b67dd5d8 100644
--- a/sys/mips/mips32/adm5120/uart_bus_adm5120.c
+++ b/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
index 0f1ebabceeda..0f1ebabceeda 100644
--- a/sys/mips/mips32/adm5120/uart_cpu_adm5120.c
+++ b/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
index 8cef8f8a1d6d..8cef8f8a1d6d 100644
--- a/sys/mips/mips32/adm5120/uart_dev_adm5120.c
+++ b/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
index e7165f18d81e..e7165f18d81e 100644
--- a/sys/mips/mips32/adm5120/uart_dev_adm5120.h
+++ b/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
index 040c3f90a042..040c3f90a042 100644
--- a/sys/mips/mips32/idt/idt_machdep.c
+++ b/sys/mips/idt/idt_machdep.c
diff --git a/sys/mips/mips32/idt/idtpci.c b/sys/mips/idt/idtpci.c
index 7e4414faaa0f..7e4414faaa0f 100644
--- a/sys/mips/mips32/idt/idtpci.c
+++ b/sys/mips/idt/idtpci.c
diff --git a/sys/mips/mips32/idt/idtreg.h b/sys/mips/idt/idtreg.h
index 3a088e74e5e1..3a088e74e5e1 100644
--- a/sys/mips/mips32/idt/idtreg.h
+++ b/sys/mips/idt/idtreg.h
diff --git a/sys/mips/mips32/idt/if_kr.c b/sys/mips/idt/if_kr.c
index 817cff2c6e62..817cff2c6e62 100644
--- a/sys/mips/mips32/idt/if_kr.c
+++ b/sys/mips/idt/if_kr.c
diff --git a/sys/mips/mips32/idt/if_krreg.h b/sys/mips/idt/if_krreg.h
index b20900ad905f..b20900ad905f 100644
--- a/sys/mips/mips32/idt/if_krreg.h
+++ b/sys/mips/idt/if_krreg.h
diff --git a/sys/mips/mips32/idt/obio.c b/sys/mips/idt/obio.c
index c938f72d2bd7..c938f72d2bd7 100644
--- a/sys/mips/mips32/idt/obio.c
+++ b/sys/mips/idt/obio.c
diff --git a/sys/mips/mips32/idt/obiovar.h b/sys/mips/idt/obiovar.h
index 526efac89e66..526efac89e66 100644
--- a/sys/mips/mips32/idt/obiovar.h
+++ b/sys/mips/idt/obiovar.h
diff --git a/sys/mips/mips32/idt/std.idt b/sys/mips/idt/std.idt
index fa067e77cabe..fa067e77cabe 100644
--- a/sys/mips/mips32/idt/std.idt
+++ b/sys/mips/idt/std.idt
diff --git a/sys/mips/mips32/idt/uart_bus_rc32434.c b/sys/mips/idt/uart_bus_rc32434.c
index 0626b521bb71..0626b521bb71 100644
--- a/sys/mips/mips32/idt/uart_bus_rc32434.c
+++ b/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
index 6bbc5bd04eb1..6bbc5bd04eb1 100644
--- a/sys/mips/mips32/idt/uart_cpu_rc32434.c
+++ b/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
index daa9e252355a..daa9e252355a 100644
--- a/sys/mips/mips32/malta/gt.c
+++ b/sys/mips/malta/gt.c
diff --git a/sys/mips/mips32/malta/gt_pci.c b/sys/mips/malta/gt_pci.c
index 25210580551f..25210580551f 100644
--- a/sys/mips/mips32/malta/gt_pci.c
+++ b/sys/mips/malta/gt_pci.c
diff --git a/sys/mips/mips32/malta/gtreg.h b/sys/mips/malta/gtreg.h
index 8fa05a0aeff9..8fa05a0aeff9 100644
--- a/sys/mips/mips32/malta/gtreg.h
+++ b/sys/mips/malta/gtreg.h
diff --git a/sys/mips/mips32/malta/gtvar.h b/sys/mips/malta/gtvar.h
index f7830ef3ccce..f7830ef3ccce 100644
--- a/sys/mips/mips32/malta/gtvar.h
+++ b/sys/mips/malta/gtvar.h
diff --git a/sys/mips/mips32/malta/malta_machdep.c b/sys/mips/malta/malta_machdep.c
index 7464c60de673..7464c60de673 100644
--- a/sys/mips/mips32/malta/malta_machdep.c
+++ b/sys/mips/malta/malta_machdep.c
diff --git a/sys/mips/mips32/malta/maltareg.h b/sys/mips/malta/maltareg.h
index f2a7d083bbb7..f2a7d083bbb7 100644
--- a/sys/mips/mips32/malta/maltareg.h
+++ b/sys/mips/malta/maltareg.h
diff --git a/sys/mips/mips32/malta/obio.c b/sys/mips/malta/obio.c
index 9e2fd7e2334a..9e2fd7e2334a 100644
--- a/sys/mips/mips32/malta/obio.c
+++ b/sys/mips/malta/obio.c
diff --git a/sys/mips/mips32/malta/obiovar.h b/sys/mips/malta/obiovar.h
index 801d46135f73..801d46135f73 100644
--- a/sys/mips/mips32/malta/obiovar.h
+++ b/sys/mips/malta/obiovar.h
diff --git a/sys/mips/mips32/malta/std.malta b/sys/mips/malta/std.malta
index d7ab1165962c..d7ab1165962c 100644
--- a/sys/mips/mips32/malta/std.malta
+++ b/sys/mips/malta/std.malta
diff --git a/sys/mips/mips32/malta/uart_bus_maltausart.c b/sys/mips/malta/uart_bus_maltausart.c
index 0d95694107fe..0d95694107fe 100644
--- a/sys/mips/mips32/malta/uart_bus_maltausart.c
+++ b/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
index ee5b1630504d..ee5b1630504d 100644
--- a/sys/mips/mips32/malta/uart_cpu_maltausart.c
+++ b/sys/mips/malta/uart_cpu_maltausart.c
diff --git a/sys/mips/mips32/malta/yamon.c b/sys/mips/malta/yamon.c
index 71ea109f3e24..71ea109f3e24 100644
--- a/sys/mips/mips32/malta/yamon.c
+++ b/sys/mips/malta/yamon.c
diff --git a/sys/mips/mips32/malta/yamon.h b/sys/mips/malta/yamon.h
index 69705103a408..69705103a408 100644
--- a/sys/mips/mips32/malta/yamon.h
+++ b/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
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
index 1c1b9c90d0a3..1c1b9c90d0a3 100644
--- a/sys/mips/mips32/sentry5/obio.c
+++ b/sys/mips/sentry5/obio.c
diff --git a/sys/mips/mips32/sentry5/obiovar.h b/sys/mips/sentry5/obiovar.h
index 27c1b373fc1e..27c1b373fc1e 100644
--- a/sys/mips/mips32/sentry5/obiovar.h
+++ b/sys/mips/sentry5/obiovar.h
diff --git a/sys/mips/mips32/sentry5/s5_machdep.c b/sys/mips/sentry5/s5_machdep.c
index c8a2bae3f4a4..c8a2bae3f4a4 100644
--- a/sys/mips/mips32/sentry5/s5_machdep.c
+++ b/sys/mips/sentry5/s5_machdep.c
diff --git a/sys/mips/mips32/sentry5/s5reg.h b/sys/mips/sentry5/s5reg.h
index 71643d0d3460..71643d0d3460 100644
--- a/sys/mips/mips32/sentry5/s5reg.h
+++ b/sys/mips/sentry5/s5reg.h
diff --git a/sys/mips/mips32/sentry5/siba_cc.c b/sys/mips/sentry5/siba_cc.c
index cd78f0b02448..cd78f0b02448 100644
--- a/sys/mips/mips32/sentry5/siba_cc.c
+++ b/sys/mips/sentry5/siba_cc.c
diff --git a/sys/mips/mips32/sentry5/siba_mips.c b/sys/mips/sentry5/siba_mips.c
index 676da834df64..676da834df64 100644
--- a/sys/mips/mips32/sentry5/siba_mips.c
+++ b/sys/mips/sentry5/siba_mips.c
diff --git a/sys/mips/mips32/sentry5/siba_sdram.c b/sys/mips/sentry5/siba_sdram.c
index 8e74e53d7f94..8e74e53d7f94 100644
--- a/sys/mips/mips32/sentry5/siba_sdram.c
+++ b/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
index e4808cd8a5ab..e4808cd8a5ab 100644
--- a/sys/mips/mips32/sentry5/uart_bus_sbusart.c
+++ b/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
index e1da9b237088..e1da9b237088 100644
--- a/sys/mips/mips32/sentry5/uart_cpu_sbusart.c
+++ b/sys/mips/sentry5/uart_cpu_sbusart.c