diff options
Diffstat (limited to 'lib/libcam')
| -rw-r--r-- | lib/libcam/Makefile | 6 | ||||
| -rw-r--r-- | lib/libcam/camlib.c | 1 | ||||
| -rw-r--r-- | lib/libcam/camlib.h | 1 | ||||
| -rw-r--r-- | lib/libcam/scsi_cmdparse.c | 1 | ||||
| -rw-r--r-- | lib/libcam/scsi_wrap.c | 1 | ||||
| -rw-r--r-- | lib/libcam/tests/Makefile | 1 |
6 files changed, 3 insertions, 8 deletions
diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile index f3f43a90d4bc..d4efbbdf4d9b 100644 --- a/lib/libcam/Makefile +++ b/lib/libcam/Makefile @@ -1,10 +1,9 @@ - PACKAGE= runtime LIB= cam SHLIBDIR?= /lib SRCS= camlib.c scsi_cmdparse.c scsi_all.c scsi_da.c scsi_sa.c cam.c \ - ata_all.c nvme_all.c smp_all.c scsi_wrap.c + ata_all.c nvme_all.c nvme_util.c smp_all.c scsi_wrap.c INCS= camlib.h scsi_wrap.h LIBADD= sbuf @@ -40,7 +39,8 @@ MLINKS+= cam.3 cam_open_device.3 \ ${SRCTOP}/sys/cam/ata \ ${SRCTOP}/sys/cam/nvme \ ${SRCTOP}/sys/cam/mmc \ - ${SRCTOP}/sys/cam/scsi + ${SRCTOP}/sys/cam/scsi \ + ${SRCTOP}/sys/dev/nvme CFLAGS+= -I${.CURDIR} -I${SRCTOP}/sys diff --git a/lib/libcam/camlib.c b/lib/libcam/camlib.c index 6074cdebeb63..6b3e62e13e6f 100644 --- a/lib/libcam/camlib.c +++ b/lib/libcam/camlib.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> #include <sys/types.h> #include <sys/param.h> #include <assert.h> diff --git a/lib/libcam/camlib.h b/lib/libcam/camlib.h index 621ac5bf08d4..c82a529181cb 100644 --- a/lib/libcam/camlib.h +++ b/lib/libcam/camlib.h @@ -64,7 +64,6 @@ #ifndef _CAMLIB_H #define _CAMLIB_H -#include <sys/cdefs.h> #include <sys/param.h> #include <cam/cam.h> diff --git a/lib/libcam/scsi_cmdparse.c b/lib/libcam/scsi_cmdparse.c index 81c8708c8d68..5aa69cd88fdb 100644 --- a/lib/libcam/scsi_cmdparse.c +++ b/lib/libcam/scsi_cmdparse.c @@ -37,7 +37,6 @@ * From: scsi.c,v 1.8 1997/02/22 15:07:54 peter Exp $ */ -#include <sys/cdefs.h> #include <sys/types.h> #include <stdlib.h> diff --git a/lib/libcam/scsi_wrap.c b/lib/libcam/scsi_wrap.c index e5bd76e6e9be..584f760bcc42 100644 --- a/lib/libcam/scsi_wrap.c +++ b/lib/libcam/scsi_wrap.c @@ -28,7 +28,6 @@ * details. */ -#include <sys/cdefs.h> #include <sys/types.h> #include <err.h> diff --git a/lib/libcam/tests/Makefile b/lib/libcam/tests/Makefile index f762332b0c73..a1726638fdc9 100644 --- a/lib/libcam/tests/Makefile +++ b/lib/libcam/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_C+= libcam_test ATF_TESTS_C+= cam_test |