From b2d3d26fa011fbb70bed9caedf4bcfd8889e6ec6 Mon Sep 17 00:00:00 2001
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 19 Sep 2014 10:32:20 +0000
Subject: [PATCH] Move rl(4) to dev/rl.

---
 sys/conf/files                 | 2 +-
 sys/dev/mii/rgephy.c           | 2 +-
 sys/dev/mii/rlphy.c            | 2 +-
 sys/dev/mii/rlswitch.c         | 2 +-
 sys/dev/re/if_re.c             | 2 +-
 sys/{pci => dev/rl}/if_rl.c    | 2 +-
 sys/{pci => dev/rl}/if_rlreg.h | 0
 sys/modules/rl/Makefile        | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename sys/{pci => dev/rl}/if_rl.c (99%)
 rename sys/{pci => dev/rl}/if_rlreg.h (100%)

diff --git a/sys/conf/files b/sys/conf/files
index 5c691c49807d..d0cccb05d892 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -2151,6 +2151,7 @@ dev/random/hash.c		optional random
 dev/random/rwfile.c		optional random
 dev/rc/rc.c			optional rc
 dev/re/if_re.c			optional re
+dev/rl/if_rl.c			optional rl pci
 dev/rndtest/rndtest.c		optional rndtest
 dev/rp/rp.c			optional rp
 dev/rp/rp_isa.c			optional rp isa
@@ -3865,7 +3866,6 @@ opencrypto/xform.c		optional crypto
 pci/alpm.c			optional alpm pci
 pci/amdpm.c			optional amdpm pci | nfpm pci
 pci/amdsmb.c			optional amdsmb pci
-pci/if_rl.c			optional rl pci
 pci/intpm.c			optional intpm pci
 pci/ncr.c			optional ncr pci \
 	compile-with "${NORMAL_C} -Wno-unused"
diff --git a/sys/dev/mii/rgephy.c b/sys/dev/mii/rgephy.c
index 2d0e60728985..381ca47452c2 100644
--- a/sys/dev/mii/rgephy.c
+++ b/sys/dev/mii/rgephy.c
@@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$");
 #include "miibus_if.h"
 
 #include <machine/bus.h>
-#include <pci/if_rlreg.h>
+#include <dev/rl/if_rlreg.h>
 
 static int rgephy_probe(device_t);
 static int rgephy_attach(device_t);
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index b98c0403ba42..21c9a66f6cf4 100644
--- a/sys/dev/mii/rlphy.c
+++ b/sys/dev/mii/rlphy.c
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
 #include "miidevs.h"
 
 #include <machine/bus.h>
-#include <pci/if_rlreg.h>
+#include <dev/rl/if_rlreg.h>
 
 #include "miibus_if.h"
 
diff --git a/sys/dev/mii/rlswitch.c b/sys/dev/mii/rlswitch.c
index 5082e7ccb060..d3e3c938df7e 100644
--- a/sys/dev/mii/rlswitch.c
+++ b/sys/dev/mii/rlswitch.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
 #include "miidevs.h"
 
 #include <machine/bus.h>
-#include <pci/if_rlreg.h>
+#include <dev/rl/if_rlreg.h>
 
 #include "miibus_if.h"
 
diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c
index 7068e6f4af78..bb4e6727c9c5 100644
--- a/sys/dev/re/if_re.c
+++ b/sys/dev/re/if_re.c
@@ -148,7 +148,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-#include <pci/if_rlreg.h>
+#include <dev/rl/if_rlreg.h>
 
 MODULE_DEPEND(re, pci, 1, 1, 1);
 MODULE_DEPEND(re, ether, 1, 1, 1);
diff --git a/sys/pci/if_rl.c b/sys/dev/rl/if_rl.c
similarity index 99%
rename from sys/pci/if_rl.c
rename to sys/dev/rl/if_rl.c
index f69866353f2b..f933aeba87ed 100644
--- a/sys/pci/if_rl.c
+++ b/sys/dev/rl/if_rl.c
@@ -127,7 +127,7 @@ MODULE_DEPEND(rl, miibus, 1, 1, 1);
 /* "device miibus" required.  See GENERIC if you get errors here. */
 #include "miibus_if.h"
 
-#include <pci/if_rlreg.h>
+#include <dev/rl/if_rlreg.h>
 
 /*
  * Various supported device vendors/types and their names.
diff --git a/sys/pci/if_rlreg.h b/sys/dev/rl/if_rlreg.h
similarity index 100%
rename from sys/pci/if_rlreg.h
rename to sys/dev/rl/if_rlreg.h
diff --git a/sys/modules/rl/Makefile b/sys/modules/rl/Makefile
index e846579a8ed7..16046adc59bb 100644
--- a/sys/modules/rl/Makefile
+++ b/sys/modules/rl/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../pci
+.PATH: ${.CURDIR}/../../dev/rl
 
 KMOD=	if_rl
 SRCS=	if_rl.c device_if.h bus_if.h pci_if.h