From owner-svn-src-all@freebsd.org  Tue Sep 20 12:59:32 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1BED8BDF9CE;
 Tue, 20 Sep 2016 12:59:32 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E305CAB4;
 Tue, 20 Sep 2016 12:59:31 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8KCxVJQ006665;
 Tue, 20 Sep 2016 12:59:31 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8KCxVd6006664;
 Tue, 20 Sep 2016 12:59:31 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201609201259.u8KCxVd6006664@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 20 Sep 2016 12:59:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r306024 - head/sys/dev/mrsas
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Sep 2016 12:59:32 -0000

Author: emaste
Date: Tue Sep 20 12:59:30 2016
New Revision: 306024
URL: https://svnweb.freebsd.org/changeset/base/306024

Log:
  mrsas: update for sys/capability.h rename in r263232

Modified:
  head/sys/dev/mrsas/mrsas_linux.c

Modified: head/sys/dev/mrsas/mrsas_linux.c
==============================================================================
--- head/sys/dev/mrsas/mrsas_linux.c	Tue Sep 20 12:58:28 2016	(r306023)
+++ head/sys/dev/mrsas/mrsas_linux.c	Tue Sep 20 12:59:30 2016	(r306024)
@@ -43,8 +43,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 
-#if (__FreeBSD_version > 900000)
-#include <sys/capability.h>
+#if (__FreeBSD_version >= 1001511)
+#include <sys/capsicum.h>
+#elif (__FreeBSD_version > 900000)
+#include <sys/capabilty.h>
 #endif
 
 #include <sys/conf.h>