From 271b33a6fdb9a444fa31b1f3e945d8a93ba7b5bc Mon Sep 17 00:00:00 2001
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Tue, 23 Sep 2014 05:54:18 +0000
Subject: [PATCH] Move amdsmb and nfsmb from dev/pci to their own device
 directory.

---
 sys/conf/files                              | 4 ++--
 sys/{pci => dev/amdsmb}/amdsmb.c            | 0
 sys/{pci => dev/nfsmb}/nfsmb.c              | 0
 sys/modules/i2c/controllers/amdsmb/Makefile | 2 +-
 sys/modules/i2c/controllers/nfsmb/Makefile  | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename sys/{pci => dev/amdsmb}/amdsmb.c (100%)
 rename sys/{pci => dev/nfsmb}/nfsmb.c (100%)

diff --git a/sys/conf/files b/sys/conf/files
index 2de3b88dfb9..a895de80229 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -654,6 +654,7 @@ dev/altera/sdcard/altera_sdcard_disk.c	optional altera_sdcard
 dev/altera/sdcard/altera_sdcard_io.c	optional altera_sdcard
 dev/altera/sdcard/altera_sdcard_fdt.c	optional altera_sdcard fdt
 dev/altera/sdcard/altera_sdcard_nexus.c	optional altera_sdcard
+dev/amdsmb/amdsmb.c		optional amdsmb pci
 dev/amr/amr.c			optional amr
 dev/amr/amr_cam.c		optional amrp amr
 dev/amr/amr_disk.c		optional amr
@@ -1979,6 +1980,7 @@ dev/netmap/netmap_offloadings.c	optional netmap
 dev/netmap/netmap_pipe.c	optional netmap
 dev/netmap/netmap_vale.c	optional netmap
 # compile-with "${NORMAL_C} -Wconversion -Wextra"
+dev/nfsmb/nfsmb.c		optional nfsmb pci
 dev/nge/if_nge.c		optional nge
 dev/nxge/if_nxge.c		optional nxge \
 	compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN}"
@@ -3868,9 +3870,7 @@ opencrypto/skipjack.c		optional crypto
 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/intpm.c			optional intpm pci
-pci/nfsmb.c			optional nfsmb pci
 pci/viapm.c			optional viapm pci
 rpc/auth_none.c			optional krpc | nfslockd | nfsclient | nfsserver | nfscl | nfsd
 rpc/auth_unix.c			optional krpc | nfslockd | nfsclient | nfscl | nfsd
diff --git a/sys/pci/amdsmb.c b/sys/dev/amdsmb/amdsmb.c
similarity index 100%
rename from sys/pci/amdsmb.c
rename to sys/dev/amdsmb/amdsmb.c
diff --git a/sys/pci/nfsmb.c b/sys/dev/nfsmb/nfsmb.c
similarity index 100%
rename from sys/pci/nfsmb.c
rename to sys/dev/nfsmb/nfsmb.c
diff --git a/sys/modules/i2c/controllers/amdsmb/Makefile b/sys/modules/i2c/controllers/amdsmb/Makefile
index d7306cebf68..43d1122b975 100644
--- a/sys/modules/i2c/controllers/amdsmb/Makefile
+++ b/sys/modules/i2c/controllers/amdsmb/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../../pci
+.PATH: ${.CURDIR}/../../../../dev/amdsmb
 
 KMOD=	amdsmb
 SRCS=	amdsmb.c
diff --git a/sys/modules/i2c/controllers/nfsmb/Makefile b/sys/modules/i2c/controllers/nfsmb/Makefile
index 21b67f3196f..bb2a0f2fe5a 100644
--- a/sys/modules/i2c/controllers/nfsmb/Makefile
+++ b/sys/modules/i2c/controllers/nfsmb/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../../../pci
+.PATH: ${.CURDIR}/../../../../dev/nfsmb
 
 KMOD=	nfsmb
 SRCS=	nfsmb.c