svn commit: r340180 - stable/11/sys/dev/mrsas

Ed Maste emaste at FreeBSD.org
Tue Nov 6 12:57:39 UTC 2018


Author: emaste
Date: Tue Nov  6 12:57:38 2018
New Revision: 340180
URL: https://svnweb.freebsd.org/changeset/base/340180

Log:
  MFC r306024: mrsas: update for sys/capability.h rename
  
  Also followup fix in r312672 by jkim.

Modified:
  stable/11/sys/dev/mrsas/mrsas_linux.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/mrsas/mrsas_linux.c
==============================================================================
--- stable/11/sys/dev/mrsas/mrsas_linux.c	Tue Nov  6 12:55:03 2018	(r340179)
+++ stable/11/sys/dev/mrsas/mrsas_linux.c	Tue Nov  6 12:57:38 2018	(r340180)
@@ -43,7 +43,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 
-#if (__FreeBSD_version > 900000)
+#if (__FreeBSD_version >= 1001511)
+#include <sys/capsicum.h>
+#elif (__FreeBSD_version > 900000)
 #include <sys/capability.h>
 #endif
 


More information about the svn-src-stable mailing list