13 files changed, 38 insertions, 28 deletions

diff --git a/sys/mips/cavium/dev/rgmii/octeon_fau.c b/sys/mips/cavium/dev/rgmii/octeon_fau.c
index 849ffd437992..f657bbcecf4a 100644
--- a/sys/mips/cavium/dev/rgmii/octeon_fau.c
+++ b/sys/mips/cavium/dev/rgmii/octeon_fau.c
@@ -4,10 +4,13 @@
  *------------------------------------------------------------------
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 
-#include <mips/octeon1/octeon_pcmap_regs.h>
+#include <mips/cavium/octeon_pcmap_regs.h>
 #include "octeon_fau.h"
 
 /*
diff --git a/sys/mips/cavium/dev/rgmii/octeon_fpa.c b/sys/mips/cavium/dev/rgmii/octeon_fpa.c
index b5d8f7c39cf4..427a2971fadf 100644
--- a/sys/mips/cavium/dev/rgmii/octeon_fpa.c
+++ b/sys/mips/cavium/dev/rgmii/octeon_fpa.c
@@ -4,6 +4,9 @@
  *------------------------------------------------------------------
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
@@ -11,7 +14,7 @@
 #include <vm/pmap.h>
 
 
-#include <mips/octeon1/octeon_pcmap_regs.h>
+#include <mips/cavium/octeon_pcmap_regs.h>
 #include "octeon_fpa.h"
 
 
diff --git a/sys/mips/cavium/dev/rgmii/octeon_ipd.c b/sys/mips/cavium/dev/rgmii/octeon_ipd.c
index 069b5376edb2..7f114ddaac87 100644
--- a/sys/mips/cavium/dev/rgmii/octeon_ipd.c
+++ b/sys/mips/cavium/dev/rgmii/octeon_ipd.c
@@ -4,10 +4,13 @@
  *------------------------------------------------------------------
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 
-#include <mips/octeon1/octeon_pcmap_regs.h>
+#include <mips/cavium/octeon_pcmap_regs.h>
 #include "octeon_ipd.h"
 
 /*
diff --git a/sys/mips/cavium/dev/rgmii/octeon_pko.c b/sys/mips/cavium/dev/rgmii/octeon_pko.c
index cfd8cd4b9924..4e47b9643da9 100644
--- a/sys/mips/cavium/dev/rgmii/octeon_pko.c
+++ b/sys/mips/cavium/dev/rgmii/octeon_pko.c
@@ -4,12 +4,15 @@
  *------------------------------------------------------------------
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#include <mips/octeon1/octeon_pcmap_regs.h>
+#include <mips/cavium/octeon_pcmap_regs.h>
 #include "octeon_fau.h"
 #include "octeon_fpa.h"
 #include "octeon_pko.h"
diff --git a/sys/mips/cavium/dev/rgmii/octeon_rgmx.c b/sys/mips/cavium/dev/rgmii/octeon_rgmx.c
index af4aba31511f..eb56a7023e29 100644
--- a/sys/mips/cavium/dev/rgmii/octeon_rgmx.c
+++ b/sys/mips/cavium/dev/rgmii/octeon_rgmx.c
@@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/locore.h>
 #include <machine/md_var.h>
 
-#include <mips/octeon1/octeon_pcmap_regs.h>
+#include <mips/cavium/octeon_pcmap_regs.h>
 
 #include "octeon_fau.h"
 #include "octeon_fpa.h"
@@ -1058,7 +1058,6 @@ static void octeon_rgmx_xmit_mark_buffers_done (struct rgmx_softc_dev *sc, u_int
          * Reset output active flag and watchdog timer.
          */
         sc->ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
-        sc->ifp->if_timer = 0;
 }
 
 
@@ -1574,7 +1573,6 @@ static void octeon_rgmx_stop (struct rgmx_softc_dev *sc)
 
         /* Reset transmitter variables and interface flags.  */
         sc->ifp->if_drv_flags &= ~(IFF_DRV_OACTIVE | IFF_DRV_RUNNING);
-        sc->ifp->if_timer = 0;
         sc->txb_count = 0;
         sc->txb_sched = 0;
 }
diff --git a/sys/mips/cavium/files.octeon1 b/sys/mips/cavium/files.octeon1
index 190d3b8c2097..c10988c46c13 100644
--- a/sys/mips/cavium/files.octeon1
+++ b/sys/mips/cavium/files.octeon1
@@ -2,16 +2,16 @@
 # Octeon Support Files
 #
 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/octeon_ebt3000_cf.c		optional cf
-mips/octeon1/octeon_machdep.c			standard
-mips/octeon1/uart_bus_octeonusart.c		optional uart
-mips/octeon1/uart_cpu_octeonusart.c		optional uart
-mips/octeon1/uart_dev_oct16550.c		optional uart
+mips/cavium/dev/rgmii/octeon_fau.c		optional rgmii
+mips/cavium/dev/rgmii/octeon_fpa.c		optional rgmii
+mips/cavium/dev/rgmii/octeon_ipd.c 		optional rgmii
+mips/cavium/dev/rgmii/octeon_pko.c		optional rgmii
+mips/cavium/dev/rgmii/octeon_rgmx.c		optional rgmii
+mips/cavium/obio.c				optional uart
+mips/cavium/octeon_ebt3000_cf.c			optional cf
+mips/cavium/octeon_machdep.c			standard
+mips/cavium/uart_bus_octeonusart.c		optional uart
+mips/cavium/uart_cpu_octeonusart.c		optional uart
+mips/cavium/uart_dev_oct16550.c			optional uart
 mips/mips/intr_machdep.c			standard
 mips/mips/tick.c				standard
diff --git a/sys/mips/cavium/obio.c b/sys/mips/cavium/obio.c
index de3910ba4e83..e782b41df156 100644
--- a/sys/mips/cavium/obio.c
+++ b/sys/mips/cavium/obio.c
@@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 
-#include <mips/octeon1/octeonreg.h>
-#include <mips/octeon1/obiovar.h>
+#include <mips/cavium/octeonreg.h>
+#include <mips/cavium/obiovar.h>
 
 int	obio_probe(device_t);
 int	obio_attach(device_t);
diff --git a/sys/mips/cavium/octeon_ebt3000_cf.c b/sys/mips/cavium/octeon_ebt3000_cf.c
index babeece040cd..3ad2759a1112 100644
--- a/sys/mips/cavium/octeon_ebt3000_cf.c
+++ b/sys/mips/cavium/octeon_ebt3000_cf.c
@@ -29,7 +29,7 @@ __FBSDID("$FreeBSD$");
 
 #include "octeon_ebt3000_cf.h"
 #include "driveid.h"
-#include <mips/octeon1/octeon_pcmap_regs.h>
+#include <mips/cavium/octeon_pcmap_regs.h>
 
 /* ATA Commands */
 #define CMD_READ_SECTOR		0x20
diff --git a/sys/mips/cavium/octeon_machdep.c b/sys/mips/cavium/octeon_machdep.c
index adec47b07417..a96e1d8c8408 100644
--- a/sys/mips/cavium/octeon_machdep.c
+++ b/sys/mips/cavium/octeon_machdep.c
@@ -60,8 +60,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpuregs.h>
 #include <machine/cpufunc.h>
-#include <mips/octeon1/octeon_pcmap_regs.h>
-#include <mips/octeon1/octeonreg.h>
+#include <mips/cavium/octeon_pcmap_regs.h>
+#include <mips/cavium/octeonreg.h>
 #include <machine/hwfunc.h>
 #include <machine/intr_machdep.h>
 #include <machine/locore.h>
diff --git a/sys/mips/cavium/std.octeon1 b/sys/mips/cavium/std.octeon1
index c46d0c770a5d..4e72e4da3ab7 100644
--- a/sys/mips/cavium/std.octeon1
+++ b/sys/mips/cavium/std.octeon1
@@ -4,7 +4,7 @@
 # */
 # $FreeBSD$
 # 
-files	"../octeon1/files.octeon1"
+files	"../cavium/files.octeon1"
 
 #
 # 
diff --git a/sys/mips/cavium/uart_bus_octeonusart.c b/sys/mips/cavium/uart_bus_octeonusart.c
index 2f43c779b56e..2ba8603823cc 100644
--- a/sys/mips/cavium/uart_bus_octeonusart.c
+++ b/sys/mips/cavium/uart_bus_octeonusart.c
@@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$");
 /*
  * XXXMIPS:
  */
-#include <mips/octeon1/octeonreg.h>
+#include <mips/cavium/octeonreg.h>
 
 #include "uart_if.h"
 
diff --git a/sys/mips/cavium/uart_cpu_octeonusart.c b/sys/mips/cavium/uart_cpu_octeonusart.c
index 7b0cdbf29b68..e4332ce36b3e 100644
--- a/sys/mips/cavium/uart_cpu_octeonusart.c
+++ b/sys/mips/cavium/uart_cpu_octeonusart.c
@@ -41,8 +41,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/uart/uart.h>
 #include <dev/uart/uart_cpu.h>
 
-#include <mips/octeon1/octeonreg.h>
-#include <mips/octeon1/octeon_pcmap_regs.h>
+#include <mips/cavium/octeonreg.h>
+#include <mips/cavium/octeon_pcmap_regs.h>
 
 bus_space_tag_t uart_bus_space_io;
 bus_space_tag_t uart_bus_space_mem;
diff --git a/sys/mips/cavium/uart_dev_oct16550.c b/sys/mips/cavium/uart_dev_oct16550.c
index 3b96a6889cbf..3e6d7c7cce7c 100644
--- a/sys/mips/cavium/uart_dev_oct16550.c
+++ b/sys/mips/cavium/uart_dev_oct16550.c
@@ -70,7 +70,7 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/ic/ns16550.h>
 
-#include <mips/octeon1/octeon_pcmap_regs.h>
+#include <mips/cavium/octeon_pcmap_regs.h>
 
 #include "uart_if.h"