diff options
| author | rwatson <rwatson@FreeBSD.org> | 2015-03-19 13:37:36 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2015-03-19 13:37:36 +0000 |
| commit | 6102a34d3875e6b3f22e0245d7698fe549c674a1 (patch) | |
| tree | df3b1e38c02357cff6357a78741ce42d4959b672 /sys/kern/subr_capability.c | |
| parent | 24836ef695b4d0b47117fe6ed0d34b16e37a68aa (diff) | |
| download | FreeBSD-src-6102a34d3875e6b3f22e0245d7698fe549c674a1.zip FreeBSD-src-6102a34d3875e6b3f22e0245d7698fe549c674a1.tar.gz | |
Merge r263233 from HEAD to stable/10:
Update kernel inclusions of capability.h to use capsicum.h instead; some
further refinement is required as some device drivers intended to be
portable over FreeBSD versions rely on __FreeBSD_version to decide whether
to include capability.h.
Sponsored by: Google, Inc.
Diffstat (limited to 'sys/kern/subr_capability.c')
| -rw-r--r-- | sys/kern/subr_capability.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/subr_capability.c b/sys/kern/subr_capability.c index ce41f4a..1504435 100644 --- a/sys/kern/subr_capability.c +++ b/sys/kern/subr_capability.c @@ -36,13 +36,13 @@ __FBSDID("$FreeBSD$"); #ifdef _KERNEL #include <sys/types.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <sys/systm.h> #include <machine/stdarg.h> #else /* !_KERNEL */ #include <sys/types.h> -#include <sys/capability.h> +#include <sys/capsicum.h> #include <assert.h> #include <stdarg.h> |
