From bc78ba97c172e5075d58182001d8caeb3a3cf898 Mon Sep 17 00:00:00 2001
From: rwatson <rwatson@FreeBSD.org>
Date: Mon, 15 Aug 2011 07:32:44 +0000
Subject: [PATCH] Fix two cases involving opt_capsicum.h and module builds:

(1) opt_capsicum.h is no longer required in ffs_alloc.c, so remove the
   #include.

(2) portalfs depends on opt_capsicum.h, so have the Makefile generate one
   if required.

These affect only modules built without a kernel (i.e, not buildkernel,
but yes buildworld if the dubious MODULES_WITH_WORLD is used).

Approved by:	re (bz)
Sponsored by:	Google Inc
---
 sys/modules/portalfs/Makefile | 3 ++-
 sys/ufs/ffs/ffs_alloc.c       | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/modules/portalfs/Makefile b/sys/modules/portalfs/Makefile
index ef6955b5d141..dcd5966c26a8 100644
--- a/sys/modules/portalfs/Makefile
+++ b/sys/modules/portalfs/Makefile
@@ -4,6 +4,7 @@
 
 KMOD=	portalfs
 SRCS=	vnode_if.h \
-	portal_vfsops.c portal_vnops.c
+	portal_vfsops.c portal_vnops.c \
+	opt_capsicum.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index 1df96a102af2..5f984b4b6ba3 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -62,7 +62,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_capsicum.h"
 #include "opt_quota.h"
 
 #include <sys/param.h>