From f4a3095dbf7e9c9e0cbd0f1344d69df95d364534 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Mon, 30 Jan 2017 00:13:31 +0100
Subject: [PATCH] Remove no longer needed include <sys/ccbque.h> (see
 075c6d38244a).

---
 Makefile_upgrade.inc |   1 +
 sys/sys/ccbque.h     | 119 ---------------------------------------------------
 2 files changed, 1 insertion(+), 119 deletions(-)
 delete mode 100644 sys/sys/ccbque.h

diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc
index 5def6079b7..2fb3d8da69 100644
--- a/Makefile_upgrade.inc
+++ b/Makefile_upgrade.inc
@@ -3188,6 +3188,7 @@ TO_REMOVE+=/boot/kernel/stg.ko
 TO_REMOVE+=/usr/include/bus/cam/scsi/scsi_dvcfg.h
 TO_REMOVE+=/usr/include/bus/cam/scsi/scsi_low.h
 TO_REMOVE+=/usr/include/bus/cam/scsi/scsi_low_pisa.h
+TO_REMOVE+=/usr/include/sys/ccbque.h
 TO_REMOVE+=/usr/share/man/man4/ncv.4.gz
 TO_REMOVE+=/usr/share/man/man4/nsp.4.gz
 TO_REMOVE+=/usr/share/man/man4/stg.4.gz
diff --git a/sys/sys/ccbque.h b/sys/sys/ccbque.h
deleted file mode 100644
index e94dca7780..0000000000
--- a/sys/sys/ccbque.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * [NetBSD for NEC PC98 series]
- *  Copyright (c) 1994, 1995, 1996 NetBSD/pc98 porting staff.
- *  All rights reserved.
- * 
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *  1. Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *  3. The name of the author may not be used to endorse or promote products
- *     derived from this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * $NetBSD$
- * $FreeBSD: src/sys/i386/isa/ccbque.h,v 1.3.6.2 2000/10/21 07:44:24 nyan Exp $
- * $DragonFly: src/sys/sys/ccbque.h,v 1.11 2008/01/05 14:02:41 swildner Exp $
- */
-/*
- * Common command control queue funcs.
- * Written by N. Honda.
- */
-
-#ifndef	_SYS_CCBQUE_H_
-#define	_SYS_CCBQUE_H_
-
-#define	CCB_MWANTED 0x01
-						
-/* (I)  structure and prototype */
-#define GENERIC_CCB_ASSERT(DEV, CCBTYPE)				\
-TAILQ_HEAD(CCBTYPE##tab, CCBTYPE);					\
-struct CCBTYPE##que {							\
-	struct CCBTYPE##tab CCBTYPE##tab;				\
-	int count;							\
-	int maxccb;							\
-	u_int flags;							\
-};									\
-									\
-void DEV##_init_ccbque (int);					\
-struct CCBTYPE *DEV##_get_ccb (void);				\
-void DEV##_free_ccb (struct CCBTYPE *);
-
-/* (II)  static allocated memory */
-#define GENERIC_CCB_STATIC_ALLOC(DEV, CCBTYPE)				\
-static struct CCBTYPE##que CCBTYPE##que;
-
-/* (III)  functions */
-#define GENERIC_CCB(DEV, CCBTYPE, CHAIN)				\
-									\
-void									\
-DEV##_init_ccbque(int count)						\
-{									\
-	if (CCBTYPE##que.maxccb == 0)					\
-		TAILQ_INIT(&CCBTYPE##que.CCBTYPE##tab);			\
-	CCBTYPE##que.maxccb += count;					\
-}									\
-									\
-struct CCBTYPE *							\
-DEV##_get_ccb(void)								\
-{									\
-	struct CCBTYPE *cb;						\
-									\
-	crit_enter();							\
-									\
-	if (CCBTYPE##que.count < CCBTYPE##que.maxccb)			\
-	{								\
-		CCBTYPE##que.count ++;					\
-		cb = TAILQ_FIRST(&CCBTYPE##que.CCBTYPE##tab);		\
-		if (cb != NULL)						\
-		{							\
-			TAILQ_REMOVE(&CCBTYPE##que.CCBTYPE##tab, cb, CHAIN);\
-			goto out;					\
-		}							\
-		else							\
-		{							\
-			cb = kmalloc(sizeof(*cb), M_DEVBUF, M_INTWAIT|M_ZERO);\
-			if (cb != NULL)					\
-				goto out;				\
-		}							\
-		CCBTYPE##que.count --;					\
-	}								\
-									\
-	cb = NULL;							\
-									\
-out:									\
-	crit_exit();							\
-	return cb;							\
-}									\
-									\
-void									\
-DEV##_free_ccb(struct CCBTYPE *cb)							\
-{									\
-	crit_enter();							\
-									\
-	TAILQ_INSERT_TAIL(&CCBTYPE##que.CCBTYPE##tab, cb, CHAIN);	\
-	CCBTYPE##que.count --;						\
-									\
-	if (CCBTYPE##que.flags & CCB_MWANTED)				\
-	{								\
-		CCBTYPE##que.flags &= ~CCB_MWANTED;			\
-		wakeup ((caddr_t) &CCBTYPE##que.count);			\
-	}								\
-	crit_exit();							\
-}
-#endif	/* !_SYS_CCBQUE_H_ */
-- 
2.11.4.GIT