diff options
| author | marius <marius@FreeBSD.org> | 2015-12-27 17:12:54 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2015-12-27 17:12:54 +0000 |
| commit | 8b47bee5a70be1de9daacbe5fabafb5e9ca262ba (patch) | |
| tree | 90393c7d89efe8e8624ca59565b7985398482eb8 /sys | |
| parent | a0fabd0e1abc05233002d9227139019d3bf322cc (diff) | |
| download | FreeBSD-src-8b47bee5a70be1de9daacbe5fabafb5e9ca262ba.zip FreeBSD-src-8b47bee5a70be1de9daacbe5fabafb5e9ca262ba.tar.gz | |
MFC: r271864
Move rl(4) to dev/rl.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/files | 2 | ||||
| -rw-r--r-- | sys/dev/mii/rgephy.c | 2 | ||||
| -rw-r--r-- | sys/dev/mii/rlphy.c | 2 | ||||
| -rw-r--r-- | sys/dev/mii/rlswitch.c | 2 | ||||
| -rw-r--r-- | sys/dev/re/if_re.c | 2 | ||||
| -rw-r--r-- | sys/dev/rl/if_rl.c (renamed from sys/pci/if_rl.c) | 2 | ||||
| -rw-r--r-- | sys/dev/rl/if_rlreg.h (renamed from sys/pci/if_rlreg.h) | 0 | ||||
| -rw-r--r-- | sys/modules/rl/Makefile | 2 |
8 files changed, 7 insertions, 7 deletions
diff --git a/sys/conf/files b/sys/conf/files index a96b1f8..73582b8 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2211,6 +2211,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 @@ -3995,7 +3996,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 2c28068..ff7c470 100644 --- a/sys/dev/mii/rgephy.c +++ b/sys/dev/mii/rgephy.c @@ -57,7 +57,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 ddf8d73..308ee22 100644 --- a/sys/dev/mii/rlphy.c +++ b/sys/dev/mii/rlphy.c @@ -53,7 +53,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 b158fd4..2e9188e 100644 --- a/sys/dev/mii/rlswitch.c +++ b/sys/dev/mii/rlswitch.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/re/if_re.c b/sys/dev/re/if_re.c index 20d47e2..842bd71 100644 --- a/sys/dev/re/if_re.c +++ b/sys/dev/re/if_re.c @@ -147,7 +147,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 index 4f91d1f..2ff1310 100644 --- a/sys/pci/if_rl.c +++ b/sys/dev/rl/if_rl.c @@ -126,7 +126,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 index b0de60f..b0de60f 100644 --- a/sys/pci/if_rlreg.h +++ b/sys/dev/rl/if_rlreg.h diff --git a/sys/modules/rl/Makefile b/sys/modules/rl/Makefile index e846579..16046ad 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 |
