From 5a323364a3bf19fe01567dbc172c23f949d5fe29 Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Mon, 11 Jan 2010 04:49:44 +0000
Subject: [PATCH] Attempt to cope with the dev/rmi -> mips/rmi/dev move.

---
 sys/mips/rmi/dev/sec/rmilib.c |  8 +++++---
 sys/mips/rmi/dev/sec/rmilib.h |  8 ++++++--
 sys/mips/rmi/dev/sec/rmisec.c |  7 +++++--
 sys/mips/rmi/dev/xlr/rge.c    | 12 +++++++-----
 sys/mips/rmi/files.xlr        |  6 +++---
 sys/mips/rmi/iodi.c           | 10 +++++++---
 6 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/sys/mips/rmi/dev/sec/rmilib.c b/sys/mips/rmi/dev/sec/rmilib.c
index 219ef6c9383c..6068e5d28522 100644
--- a/sys/mips/rmi/dev/sec/rmilib.c
+++ b/sys/mips/rmi/dev/sec/rmilib.c
@@ -26,9 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * RMI_BSD */
+ * RMI_BSD
+ */
 
 #include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -54,8 +56,8 @@
 #include <mips/xlr/iomap.h>
 #include <mips/xlr/msgring.h>
 #include <mips/xlr/board.h>
-#include <dev/rmi/sec/rmilib.h>
-#include <dev/rmi/sec/desc.h>
+#include <mips/rmi/dev/sec/rmilib.h>
+#include <mips/rmi/dev/sec/desc.h>
 
 
 // static int msgrng_stnid_pk0 = MSGRNG_STNID_PK0;
diff --git a/sys/mips/rmi/dev/sec/rmilib.h b/sys/mips/rmi/dev/sec/rmilib.h
index 060b9db1cbd8..1f65c885c102 100644
--- a/sys/mips/rmi/dev/sec/rmilib.h
+++ b/sys/mips/rmi/dev/sec/rmilib.h
@@ -26,12 +26,16 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * RMI_BSD */
+ * RMI_BSD
+ */
 
 #ifndef _RMILIB_H_
 #define _RMILIB_H_
 
-#include <dev/rmi/sec/desc.h>
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <mips/rmi/dev/sec/desc.h>
 #include <mips/xlr/iomap.h>
 
 /*#define XLR_SEC_CMD_DEBUG*/
diff --git a/sys/mips/rmi/dev/sec/rmisec.c b/sys/mips/rmi/dev/sec/rmisec.c
index ad20e0955efd..acced4ac1306 100644
--- a/sys/mips/rmi/dev/sec/rmisec.c
+++ b/sys/mips/rmi/dev/sec/rmisec.c
@@ -26,8 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * RMI_BSD */
+ * RMI_BSD
+ */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -52,7 +55,7 @@
 #include <opencrypto/cryptodev.h>
 #include <sys/random.h>
 
-#include <dev/rmi/sec/rmilib.h>
+#include <mips/rmi/dev/sec/rmilib.h>
 
 /*#define RMI_SEC_DEBUG */
 
diff --git a/sys/mips/rmi/dev/xlr/rge.c b/sys/mips/rmi/dev/xlr/rge.c
index e0fa8c15851a..364955a88150 100644
--- a/sys/mips/rmi/dev/xlr/rge.c
+++ b/sys/mips/rmi/dev/xlr/rge.c
@@ -26,7 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * RMI_BSD */
+ * RMI_BSD
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #ifdef HAVE_KERNEL_OPTION_HEADERS
 #include "opt_device_polling.h"
@@ -90,10 +94,8 @@
 #include <mips/rmi/shared_structs.h>
 #include <mips/rmi/board.h>
 
-#include <dev/rmi/xlr/atx_cpld.h>
-#include <dev/rmi/xlr/xgmac_mdio.h>
-
-
+#include <mips/rmi/dev/xlr/atx_cpld.h>
+#include <mips/rmi/dev/xlr/xgmac_mdio.h>
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
diff --git a/sys/mips/rmi/files.xlr b/sys/mips/rmi/files.xlr
index e2ed518b040d..22cd521389a9 100644
--- a/sys/mips/rmi/files.xlr
+++ b/sys/mips/rmi/files.xlr
@@ -17,10 +17,10 @@ mips/rmi/perfmon_percpu.c			optional xlr_perfmon
 #mips/rmi/pcibus.c				optional pci
 #mips/rmi/xlr_pci.c				optional pci
 #mips/rmi/xls_ehci.c				optional usb ehci
-dev/rmi/xlr/rge.c				optional rge
 mips/rmi/bus_space_rmi.c			standard
+mips/rmi/dev/sec/rmisec.c			optional rmisec
+mips/rmi/dev/sec/rmilib.c			optional rmisec
+mips/rmi/dev/xlr/rge.c				optional rge
 dev/iicbus/xlr_rtc.c				optional xlr_rtc
 dev/iicbus/xlr_temperature.c			optional xlr_temperature
 dev/iicbus/xlr_eeprom.c				optional xlr_eeprom
-dev/rmi/sec/rmisec.c				optional rmisec
-dev/rmi/sec/rmilib.c				optional rmisec
diff --git a/sys/mips/rmi/iodi.c b/sys/mips/rmi/iodi.c
index 0983fe715471..76796ada32de 100644
--- a/sys/mips/rmi/iodi.c
+++ b/sys/mips/rmi/iodi.c
@@ -26,7 +26,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * RMI_BSD */
+ * RMI_BSD
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
@@ -67,8 +71,8 @@
 #include <mips/rmi/shared_structs.h>
 #include <mips/rmi/board.h>
 
-#include <dev/rmi/xlr/atx_cpld.h>
-#include <dev/rmi/xlr/xgmac_mdio.h>
+#include <mips/rmi/dev/xlr/atx_cpld.h>
+#include <mips/rmi/dev/xlr/xgmac_mdio.h>
 
 extern void iodi_activateirqs(void);