svn commit: r360002 - head/usr.sbin/mpsutil

[Scott Long]

Author: scottl
Date: Thu Apr 16 03:33:46 2020
New Revision: 360002
URL: https://svnweb.freebsd.org/changeset/base/360002

Log:
  Don't keep a private copy of mpr_ioctl.h and mps_ioctl.h, since they
  easily get out of sync with the real files from the driver.

Deleted:
  head/usr.sbin/mpsutil/mpr_ioctl.h
  head/usr.sbin/mpsutil/mps_ioctl.h
Modified:
  head/usr.sbin/mpsutil/mps_cmd.c

Modified: head/usr.sbin/mpsutil/mps_cmd.c
==============================================================================
--- head/usr.sbin/mpsutil/mps_cmd.c	Thu Apr 16 03:28:28 2020	(r360001)
+++ head/usr.sbin/mpsutil/mps_cmd.c	Thu Apr 16 03:33:46 2020	(r360002)
@@ -39,12 +39,6 @@ __RCSID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
-#if 0
-#include <sys/mps_ioctl.h>
-#else
-#include "mps_ioctl.h"
-#include "mpr_ioctl.h"
-#endif
 #include <sys/sysctl.h>
 #include <sys/uio.h>
 
@@ -56,6 +50,8 @@ __RCSID("$FreeBSD$");
 #include <unistd.h>
 
 #include "mpsutil.h"
+#include <dev/mps/mps_ioctl.h>
+#include <dev/mpr/mpr_ioctl.h>
 
 #ifndef USE_MPT_IOCTLS
 #define USE_MPT_IOCTLS