12 files changed, 10 insertions, 15 deletions

diff --git a/sys/dev/le/octeon_fau.c b/sys/mips/octeon1/dev/rgmii/octeon_fau.c
index f51d6f9fb9672..f51d6f9fb9672 100644
--- a/sys/dev/le/octeon_fau.c
+++ b/sys/mips/octeon1/dev/rgmii/octeon_fau.c
diff --git a/sys/dev/le/octeon_fau.h b/sys/mips/octeon1/dev/rgmii/octeon_fau.h
index fc87395f02451..fc87395f02451 100644
--- a/sys/dev/le/octeon_fau.h
+++ b/sys/mips/octeon1/dev/rgmii/octeon_fau.h
diff --git a/sys/dev/le/octeon_fpa.c b/sys/mips/octeon1/dev/rgmii/octeon_fpa.c
index 04cb19408aaeb..04cb19408aaeb 100644
--- a/sys/dev/le/octeon_fpa.c
+++ b/sys/mips/octeon1/dev/rgmii/octeon_fpa.c
diff --git a/sys/dev/le/octeon_fpa.h b/sys/mips/octeon1/dev/rgmii/octeon_fpa.h
index 04cd98bbd26e9..04cd98bbd26e9 100644
--- a/sys/dev/le/octeon_fpa.h
+++ b/sys/mips/octeon1/dev/rgmii/octeon_fpa.h
diff --git a/sys/dev/le/octeon_ipd.c b/sys/mips/octeon1/dev/rgmii/octeon_ipd.c
index d70758d4de9a3..d70758d4de9a3 100644
--- a/sys/dev/le/octeon_ipd.c
+++ b/sys/mips/octeon1/dev/rgmii/octeon_ipd.c
diff --git a/sys/dev/le/octeon_ipd.h b/sys/mips/octeon1/dev/rgmii/octeon_ipd.h
index 21e26c83e9f59..21e26c83e9f59 100644
--- a/sys/dev/le/octeon_ipd.h
+++ b/sys/mips/octeon1/dev/rgmii/octeon_ipd.h
diff --git a/sys/dev/le/octeon_pip.h b/sys/mips/octeon1/dev/rgmii/octeon_pip.h
index f474e5e80b6d0..f474e5e80b6d0 100644
--- a/sys/dev/le/octeon_pip.h
+++ b/sys/mips/octeon1/dev/rgmii/octeon_pip.h
diff --git a/sys/dev/le/octeon_pko.c b/sys/mips/octeon1/dev/rgmii/octeon_pko.c
index 7d402c25da0cd..7d402c25da0cd 100644
--- a/sys/dev/le/octeon_pko.c
+++ b/sys/mips/octeon1/dev/rgmii/octeon_pko.c
diff --git a/sys/dev/le/octeon_pko.h b/sys/mips/octeon1/dev/rgmii/octeon_pko.h
index 4ecc3b9618d54..4ecc3b9618d54 100644
--- a/sys/dev/le/octeon_pko.h
+++ b/sys/mips/octeon1/dev/rgmii/octeon_pko.h
diff --git a/sys/dev/le/octeon_rgmx.c b/sys/mips/octeon1/dev/rgmii/octeon_rgmx.c
index 29856d5c7ee57..29856d5c7ee57 100644
--- a/sys/dev/le/octeon_rgmx.c
+++ b/sys/mips/octeon1/dev/rgmii/octeon_rgmx.c
diff --git a/sys/dev/le/octeon_rgmx.h b/sys/mips/octeon1/dev/rgmii/octeon_rgmx.h
index 8e446ec47d940..8e446ec47d940 100644
--- a/sys/dev/le/octeon_rgmx.h
+++ b/sys/mips/octeon1/dev/rgmii/octeon_rgmx.h
diff --git a/sys/mips/octeon1/files.octeon1 b/sys/mips/octeon1/files.octeon1
index 120c62ef2e922..858a188854496 100644
--- a/sys/mips/octeon1/files.octeon1
+++ b/sys/mips/octeon1/files.octeon1
@@ -1,20 +1,15 @@
-# /*
-#  *    This product includes software developed by the University of
-#  *    California, Berkeley and its contributors."
-# */
 # $FreeBSD$
 # Octeon Support Files
 #
-mips/octeon1/octeon_machdep.c			standard
+dev/uart/uart_dev_oct16550.c			optional uart
+mips/mips/mp_machdep.c				optional smp
+mips/octeon1/dev/rgmii/octeon_fau.c		optional rgmii
+mips/octeon1/dev/rgmii/octeon_fpa.c		optional rgmii
+mips/octeon1/dev/rgmii/octeon_ipd.c 		optional rgmii
+mips/octeon1/dev/rgmii/octeon_pko.c		optional rgmii
+mips/octeon1/dev/rgmii/octeon_rgmx.c		optional rgmii
 mips/octeon1/obio.c				optional uart
-mips/octeon1/uart_cpu_octeonusart.c		optional uart
-mips/octeon1/uart_bus_octeonusart.c		optional uart
 mips/octeon1/octeon_ebt3000_cf.c		optional cf
-
-mips/mips/mp_machdep.c                          optional smp
-dev/uart/uart_dev_oct16550.c			optional uart
-dev/le/octeon_fau.c				optional rgmii
-dev/le/octeon_fpa.c				optional rgmii
-dev/le/octeon_ipd.c 				optional rgmii
-dev/le/octeon_pko.c				optional rgmii
-dev/le/octeon_rgmx.c				optional rgmii
+mips/octeon1/octeon_machdep.c			standard
+mips/octeon1/uart_bus_octeonusart.c		optional uart
+mips/octeon1/uart_cpu_octeonusart.c		optional uart