Final bit of PR 41200: headers that declare ioctls should include sys/ioccom.h.

This covers most if not all of the MD headers. XXX: a lot of the ioctl definitions in some of these files are cutpasted.
2015-09-07 03:49:44 +00:00 · 2015-09-07 03:49:44 +00:00 · 25d3b9e7cb
parent ea72de740f
commit 25d3b9e7cb
38 changed files with 110 additions and 37 deletions
--- a/sys/arch/acorn32/include/scrio.h
+++ b/sys/arch/acorn32/include/scrio.h
@ -1,4 +1,4 @@
-/*	$NetBSD: scrio.h,v 1.1 2001/10/05 22:27:52 reinoud Exp $	*/
+/*	$NetBSD: scrio.h,v 1.2 2015/09/07 03:49:44 dholland Exp $	*/

 /*
 * Copyright 1997
@ -40,6 +40,8 @@
 #ifndef _ARM32_SCRIO_H_
 #define _ARM32_SCRIO_H_

+#include <sys/ioccom.h>
+
 #define ATR_BUF_MAX	1 + 1 + 4 * 10 + 15 + 1 /* TS + T0 + 4 * TABCD + 15 * TK + TCK */
 #define CMD_BUF_LEN	5
 #define DATA_BUF_MAX	256
--- a/sys/arch/alpha/include/kbio.h
+++ b/sys/arch/alpha/include/kbio.h
@ -1,4 +1,4 @@
-/* $NetBSD: kbio.h,v 1.4 2005/12/11 12:16:16 christos Exp $ */
+/* $NetBSD: kbio.h,v 1.5 2015/09/07 03:49:44 dholland Exp $ */

 /*
 * Copyright (c) 1992, 1993
@ -40,6 +40,8 @@
 *	@(#)kbio.h	8.1 (Berkeley) 6/11/93
 */

+#include <sys/ioccom.h>
+
 #if 0 /* XXX */
 /*
 * The following is a minimal emulation of Sun's `kio' structures
--- a/sys/arch/amiga/dev/clockioctl.h
+++ b/sys/arch/amiga/dev/clockioctl.h
@ -1,4 +1,4 @@
-/*	$NetBSD: clockioctl.h,v 1.5 2011/02/08 20:20:08 rmind Exp $	*/
+/*	$NetBSD: clockioctl.h,v 1.6 2015/09/07 03:49:45 dholland Exp $	*/

 /*
 * Copyright (c) 1989 University of Utah.
@ -38,6 +38,8 @@
 *	@(#)clockioctl.h	7.2 (Berkeley) 11/2/90
 */

+#include <sys/ioccom.h>
+
 #define	CLOCKMAP	_IOWR('C', 1, int)
 #define	CLOCKUNMAP	_IOW('C', 2, int)
 #define	CLOCKGETRES	_IOR('C', 3, int)
--- a/sys/arch/amiga/dev/grfioctl.h
+++ b/sys/arch/amiga/dev/grfioctl.h
@ -1,4 +1,4 @@
-/*	$NetBSD: grfioctl.h,v 1.20 2011/02/08 20:20:08 rmind Exp $	*/
+/*	$NetBSD: grfioctl.h,v 1.21 2015/09/07 03:49:45 dholland Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -38,6 +38,8 @@
 *	@(#)grfioctl.h	7.2 (Berkeley) 11/4/90
 */

+#include <sys/ioccom.h>
+
 /* these are changeable values, encapsulated in their own structure, so
   no the whole thing has to be copied when setting parameters. */
 struct grfdyninfo {
--- a/sys/arch/amiga/dev/iteioctl.h
+++ b/sys/arch/amiga/dev/iteioctl.h
@ -1,4 +1,4 @@
-/*	$NetBSD: iteioctl.h,v 1.12 2011/02/08 20:20:08 rmind Exp $	*/
+/*	$NetBSD: iteioctl.h,v 1.13 2015/09/07 03:49:45 dholland Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -38,6 +38,8 @@
 *	@(#)iteioctl.h	7.2 (Berkeley) 11/4/90
 */

+#include <sys/ioccom.h>
+
 struct itewinsize {
 	int x;			/* leftedge offset to the right */
 	int y;			/* topedge offset down */
--- a/sys/arch/amiga/dev/kbdreg.h
+++ b/sys/arch/amiga/dev/kbdreg.h
@ -1,4 +1,4 @@
-/*	$NetBSD: kbdreg.h,v 1.7 2005/12/11 12:16:28 christos Exp $	*/
+/*	$NetBSD: kbdreg.h,v 1.8 2015/09/07 03:49:45 dholland Exp $	*/

 /*
 * losely based on:
@ -44,6 +44,8 @@
 * Header: kbio.h,v 1.4 92/11/26 01:16:32 torek Exp  (LBL)
 */

+#include <sys/ioccom.h>
+
 #define	KIOCTRANS	_IOW('k', 0, int)	/* set translation mode */
 			/* (we only accept TR_UNTRANS_EVENT) */
 #define	KIOCGTRANS	_IOR('k', 5, int)	/* get translation mode */
--- a/sys/arch/amiga/dev/viewioctl.h
+++ b/sys/arch/amiga/dev/viewioctl.h
@ -1,4 +1,4 @@
-/*	$NetBSD: viewioctl.h,v 1.9 2002/09/06 13:18:43 gehenna Exp $	*/
+/*	$NetBSD: viewioctl.h,v 1.10 2015/09/07 03:49:45 dholland Exp $	*/

 /*
 * Copyright (c) 1994 Christian E. Hopps
@ -39,6 +39,8 @@
 * a interface to graphics.
 */

+#include <sys/ioccom.h>
+
 struct view_size {
    int x;
    int y;
--- a/sys/arch/atari/dev/clockioctl.h
+++ b/sys/arch/atari/dev/clockioctl.h
@ -1,4 +1,4 @@
-/*	$NetBSD: clockioctl.h,v 1.4 2011/02/08 20:20:10 rmind Exp $	*/
+/*	$NetBSD: clockioctl.h,v 1.5 2015/09/07 03:49:45 dholland Exp $	*/

 /*
 * Copyright (c) 1989 University of Utah.
@ -38,6 +38,8 @@
 *	@(#)clockioctl.h	7.2 (Berkeley) 11/2/90
 */

+#include <sys/ioccom.h>
+
 #define	CLOCKMAP	_IOWR('C', 1, int)
 #define	CLOCKUNMAP	_IOW('C', 2, int)
 #define	CLOCKGETRES	_IOR('C', 3, int)
--- a/sys/arch/atari/dev/grfioctl.h
+++ b/sys/arch/atari/dev/grfioctl.h
@ -1,4 +1,4 @@
-/*	$NetBSD: grfioctl.h,v 1.9 2011/02/08 20:20:10 rmind Exp $	*/
+/*	$NetBSD: grfioctl.h,v 1.10 2015/09/07 03:49:45 dholland Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -41,6 +41,8 @@
 #ifndef _MACHINE_GRFIOCTL_H_
 #define _MACHINE_GRFIOCTL_H_

+#include <sys/ioccom.h>
+
 /* these are changeable values, encapsulated in their own structure, so
   no the whole thing has to be copied when setting parameters. */
 struct grfdyninfo {
--- a/sys/arch/atari/dev/iteioctl.h
+++ b/sys/arch/atari/dev/iteioctl.h
@ -1,4 +1,4 @@
-/*	$NetBSD: iteioctl.h,v 1.7 2011/02/08 20:20:10 rmind Exp $	*/
+/*	$NetBSD: iteioctl.h,v 1.8 2015/09/07 03:49:45 dholland Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -41,6 +41,8 @@
 #ifndef _MACHINE_ITEIOCTL_H_
 #define _MACHINE_ITEIOCTL_H_

+#include <sys/ioccom.h>
+
 #ifndef _KERNEL
 #include <machine/kbdmap.h>
 #endif
--- a/sys/arch/atari/dev/kbdreg.h
+++ b/sys/arch/atari/dev/kbdreg.h
@ -1,4 +1,4 @@
-/*	$NetBSD: kbdreg.h,v 1.5 2005/12/11 12:16:54 christos Exp $	*/
+/*	$NetBSD: kbdreg.h,v 1.6 2015/09/07 03:49:45 dholland Exp $	*/

 /*
 * Copyright (c) 1992, 1993
@ -45,6 +45,8 @@
 #ifndef _MACHINE_KBDREG_H_
 #define _MACHINE_KBDREG_H_

+#include <sys/ioccom.h>
+
 struct kbdbell {
 	u_int volume;		/* volume of bell (0-64) */
 	u_int pitch;		/* pitch of bell (10-20000) */
--- a/sys/arch/atari/dev/viewioctl.h
+++ b/sys/arch/atari/dev/viewioctl.h
@ -1,4 +1,4 @@
-/*	$NetBSD: viewioctl.h,v 1.1.1.1 1995/03/26 07:12:14 leo Exp $	*/
+/*	$NetBSD: viewioctl.h,v 1.2 2015/09/07 03:49:45 dholland Exp $	*/

 /*
 * Copyright (c) 1994 Christian E. Hopps
@ -39,6 +39,8 @@
 * a interface to graphics.
 */

+#include <sys/ioccom.h>
+
 struct view_size {
    int		x;
    int		y;
--- a/sys/arch/atari/include/msioctl.h
+++ b/sys/arch/atari/include/msioctl.h
@ -1,4 +1,4 @@
-/*	$NetBSD: msioctl.h,v 1.4 2009/10/20 19:10:11 snj Exp $	*/
+/*	$NetBSD: msioctl.h,v 1.5 2015/09/07 03:49:45 dholland Exp $	*/

 /*
 * Copyright (c) 1996 Leo Weppelman
@ -25,6 +25,8 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#include <sys/ioccom.h>
+
 #define MIOCS3B_EMUL	_IOW('M', 0x0, int)	/* Set/clear 3But emulation */
 #define MIOCG3B_EMUL	_IOR('M', 0x1, int)	/* Get 3But emulation state */

--- a/sys/arch/atari/vme/leoioctl.h
+++ b/sys/arch/atari/vme/leoioctl.h
@ -1,4 +1,4 @@
-/*	$NetBSD: leoioctl.h,v 1.2 2008/04/28 20:23:15 martin Exp $	*/
+/*	$NetBSD: leoioctl.h,v 1.3 2015/09/07 03:49:45 dholland Exp $	*/

 /*-
 * Copyright (c) 1997 maximum entropy <entropy@zippy.bernstein.com>
@ -27,5 +27,7 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */

+#include <sys/ioccom.h>
+
 #define LIOCYRES _IOW('l', 0, int)
 #define LIOCSCRL _IOW('l', 1, int)
--- a/sys/arch/hp300/stand/common/scsireg.h
+++ b/sys/arch/hp300/stand/common/scsireg.h
@ -1,4 +1,4 @@
-/*	$NetBSD: scsireg.h,v 1.3 2011/02/08 20:20:14 rmind Exp $	*/
+/*	$NetBSD: scsireg.h,v 1.4 2015/09/07 03:49:45 dholland Exp $	*/

 /*
 * Copyright (c) 1990, 1993
@ -38,6 +38,8 @@
 * HP 98265A SCSI Interface Hardware Description.
 */

+#include <sys/ioccom.h>
+
 struct scsidevice {
 	u_char	p0,  scsi_id;
 #define			ID_MASK		0x1f
--- a/sys/arch/mac68k/include/grfioctl.h
+++ b/sys/arch/mac68k/include/grfioctl.h
@ -1,4 +1,4 @@
-/*	$NetBSD: grfioctl.h,v 1.14 2011/02/08 20:20:17 rmind Exp $	*/
+/*	$NetBSD: grfioctl.h,v 1.15 2015/09/07 03:49:45 dholland Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -41,6 +41,8 @@
 #ifndef _MAC68K_GRFIOCTL_H_
 #define _MAC68K_GRFIOCTL_H_

+#include <sys/ioccom.h>
+
 struct grfmode {
 	u_int8_t	mode_id;	/* Identifier for mode              */
 	u_int8_t	pad0;
--- a/sys/arch/macppc/include/grfioctl.h
+++ b/sys/arch/macppc/include/grfioctl.h
@ -1,4 +1,4 @@
-/*	$NetBSD: grfioctl.h,v 1.6 2011/02/08 20:20:18 rmind Exp $	*/
+/*	$NetBSD: grfioctl.h,v 1.7 2015/09/07 03:49:45 dholland Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -41,6 +41,8 @@
 #ifndef _MACPPC_GRFIOCTL_H_
 #define _MACPPC_GRFIOCTL_H_

+#include <sys/ioccom.h>
+
 struct	grfinfo {
 	void *	gd_regaddr;		/* control registers physaddr */
 	int	gd_regsize;		/* control registers size */
--- a/sys/arch/newsmips/include/wsconsio.h
+++ b/sys/arch/newsmips/include/wsconsio.h
@ -1,8 +1,9 @@
-/*	$NetBSD: wsconsio.h,v 1.2 2005/12/11 12:18:24 christos Exp $	*/
+/*	$NetBSD: wsconsio.h,v 1.3 2015/09/07 03:49:45 dholland Exp $	*/

 #ifndef _NEWSMIPS_WSCONSIO_H_
 #define	_NEWSMIPS_WSCONSIO_H_

+#include <sys/ioccom.h>
 #include <dev/wscons/wsconsio.h>

 struct newsmips_wsdisplay_fbinfo {
--- a/sys/arch/ofppc/include/grfioctl.h
+++ b/sys/arch/ofppc/include/grfioctl.h
@ -1,4 +1,4 @@
-/*	$NetBSD: grfioctl.h,v 1.3 2011/02/08 20:20:22 rmind Exp $	*/
+/*	$NetBSD: grfioctl.h,v 1.4 2015/09/07 03:49:45 dholland Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -41,6 +41,8 @@
 #ifndef _MACPPC_GRFIOCTL_H_
 #define _MACPPC_GRFIOCTL_H_

+#include <sys/ioccom.h>
+
 struct	grfinfo {
 	void *	gd_regaddr;		/* control registers physaddr */
 	int	gd_regsize;		/* control registers size */
--- a/sys/arch/prep/include/nvram.h
+++ b/sys/arch/prep/include/nvram.h
@ -1,4 +1,4 @@
-/* $NetBSD: nvram.h,v 1.8 2012/10/27 17:18:08 chs Exp $ */
+/* $NetBSD: nvram.h,v 1.9 2015/09/07 03:49:45 dholland Exp $ */

 /*-
 * Copyright (c) 2006 The NetBSD Foundation, Inc.
@ -39,6 +39,8 @@
 #ifndef _MACHINE_NVRAM_H
 #define _MACHINE_NVRAM_H

+#include <sys/ioccom.h>
+
 #if defined(_KERNEL)
 /* for the motorola machines */
 #include <dev/ic/mk48txxvar.h>
--- a/sys/arch/sh3/include/wdogvar.h
+++ b/sys/arch/sh3/include/wdogvar.h
@ -1,8 +1,10 @@
-/*	$NetBSD: wdogvar.h,v 1.6 2002/04/28 17:10:37 uch Exp $	*/
+/*	$NetBSD: wdogvar.h,v 1.7 2015/09/07 03:49:45 dholland Exp $	*/

 #ifndef _SH3_WDOGVAR_H_
 #define	_SH3_WDOGVAR_H_

+#include <sys/ioccom.h>
+
 #define	WDOGF_OPEN	1

 #define	SIORESETWDOG	_IO('S', 0x0)
--- a/sys/arch/shark/include/beep.h
+++ b/sys/arch/shark/include/beep.h
@ -1,4 +1,4 @@
-/*	$NetBSD: beep.h,v 1.2 2007/03/04 06:00:42 christos Exp $	*/
+/*	$NetBSD: beep.h,v 1.3 2015/09/07 03:49:45 dholland Exp $	*/

 /*
 * Copyright (c) Mark Brinicombe 1995 All rights reserved
@ -30,6 +30,7 @@
 */

 #include <sys/types.h>
+#include <sys/ioccom.h>

 struct wavebuffer {
 	void *addr;
--- a/sys/arch/shark/include/kbd.h
+++ b/sys/arch/shark/include/kbd.h
@ -1,4 +1,4 @@
-/*	$NetBSD: kbd.h,v 1.2 2009/03/14 14:46:06 dsl Exp $	*/
+/*	$NetBSD: kbd.h,v 1.3 2015/09/07 03:49:45 dholland Exp $	*/

 /*
 * Copyright (c) 1995 Mark Brinicombe.
@ -39,6 +39,8 @@
 * Created      : 21/07/95
 */

+#include <sys/ioccom.h>
+
 struct kbd_data {
 	int keycode;
 	struct timeval event_time;
--- a/sys/arch/shark/include/mouse.h
+++ b/sys/arch/shark/include/mouse.h
@ -1,4 +1,4 @@
-/*	$NetBSD: mouse.h,v 1.2 2002/04/19 01:43:49 wiz Exp $	*/
+/*	$NetBSD: mouse.h,v 1.3 2015/09/07 03:49:45 dholland Exp $	*/

 /*
 * Copyright (c) Mark Brinicombe 1996 All rights reserved
@ -31,6 +31,8 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#include <sys/ioccom.h>
+
 /*
 #define MOUSE_BUTTON_RIGHT  0x10
 #define MOUSE_BUTTON_MIDDLE 0x20
--- a/sys/arch/shark/include/profileio.h
+++ b/sys/arch/shark/include/profileio.h
@ -1,4 +1,4 @@
-/*	$NetBSD: profileio.h,v 1.1 2002/02/10 01:57:37 thorpej Exp $	*/
+/*	$NetBSD: profileio.h,v 1.2 2015/09/07 03:49:45 dholland Exp $	*/

 /*
 * Copyright 1997
@ -45,6 +45,7 @@
 #define __PROFILE_IO_H__

 #include <sys/types.h>
+#include <sys/ioccom.h>

 /* I have no idea what the 'P' group id means, 
 * I presume it isn't used for much.??
--- a/sys/arch/shark/include/scrio.h
+++ b/sys/arch/shark/include/scrio.h
@ -1,4 +1,4 @@
-/*	$NetBSD: scrio.h,v 1.1 2002/02/10 01:57:40 thorpej Exp $	*/
+/*	$NetBSD: scrio.h,v 1.2 2015/09/07 03:49:45 dholland Exp $	*/

 /*
 * Copyright 1997
@ -40,6 +40,8 @@
 #ifndef _ARM32_SCRIO_H_
 #define _ARM32_SCRIO_H_

+#include <sys/ioccom.h>
+
 #define ATR_BUF_MAX	1 + 1 + 4 * 10 + 15 + 1 /* TS + T0 + 4 * TABCD + 15 * TK + TCK */
 #define CMD_BUF_LEN	5
 #define DATA_BUF_MAX	256
--- a/sys/arch/sparc/dev/cgfourteenvar.h
+++ b/sys/arch/sparc/dev/cgfourteenvar.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cgfourteenvar.h,v 1.16 2013/05/29 22:26:39 macallan Exp $ */
+/*	$NetBSD: cgfourteenvar.h,v 1.17 2015/09/07 03:49:45 dholland Exp $ */

 /*
 * Copyright (c) 1996
@ -32,6 +32,9 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 */
+
+#include <sys/ioccom.h>
+
 struct sbus_reg {
 	uint32_t	sbr_slot;
 	uint32_t	sbr_offset;
--- a/sys/arch/sparc/include/openpromio.h
+++ b/sys/arch/sparc/include/openpromio.h
@ -1,4 +1,4 @@
-/*	$NetBSD: openpromio.h,v 1.6 2005/12/11 12:19:05 christos Exp $ */
+/*	$NetBSD: openpromio.h,v 1.7 2015/09/07 03:49:46 dholland Exp $ */

 /*
 * Copyright (c) 1992, 1993
@ -43,6 +43,8 @@
 #ifndef _SPARC_OPENPROMIO_H_
 #define _SPARC_OPENPROMIO_H_

+#include <sys/ioccom.h>
+
 struct opiocdesc {
 	int	op_nodeid;		/* passed or returned node id */
 	int	op_namelen;		/* length of op_name */
--- a/sys/arch/sparc/include/tctrl.h
+++ b/sys/arch/sparc/include/tctrl.h
@ -1,4 +1,4 @@
-/*	$NetBSD: tctrl.h,v 1.4 2008/04/28 20:23:36 martin Exp $	*/
+/*	$NetBSD: tctrl.h,v 1.5 2015/09/07 03:49:46 dholland Exp $	*/

 /*-
 * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -31,6 +31,8 @@
 #ifndef _MACHINE_TCTRL_H
 #define	_MACHINE_TCTRL_H

+#include <sys/ioccom.h>
+
 struct tctrl_req {
 	uint8_t        cmdbuf[16];
 	uint8_t        cmdlen;
--- a/sys/arch/sun3/dev/xio.h
+++ b/sys/arch/sun3/dev/xio.h
@ -1,4 +1,4 @@
-/* $NetBSD: xio.h,v 1.3 2011/02/01 20:19:32 chuck Exp $ */
+/* $NetBSD: xio.h,v 1.4 2015/09/07 03:49:46 dholland Exp $ */

 /*
 * Copyright (c) 1995 Charles D. Cranor
@ -39,6 +39,8 @@
 * xylogic ioctl interface
 */

+#include <sys/ioccom.h>
+
 struct xd_iocmd {
  u_char cmd;       /* in: command number */
  u_char subfn;     /* in: subfunction number */
--- a/sys/arch/x68k/include/grfioctl.h
+++ b/sys/arch/x68k/include/grfioctl.h
@ -1,4 +1,4 @@
-/*	$NetBSD: grfioctl.h,v 1.6 2011/02/08 20:20:26 rmind Exp $	*/
+/*	$NetBSD: grfioctl.h,v 1.7 2015/09/07 03:49:46 dholland Exp $	*/

 /*
 * Copyright (c) 1988 University of Utah.
@ -41,6 +41,8 @@
 #ifndef _X68K_GRFIOCTL_H_
 #define	_X68K_GRFIOCTL_H_

+#include <sys/ioccom.h>
+
 struct	grfinfo {
 	int	gd_id;			/* HPUX identifier */
 	void *	gd_regaddr;		/* control registers physaddr */
--- a/sys/arch/x68k/include/iteioctl.h
+++ b/sys/arch/x68k/include/iteioctl.h
@ -34,12 +34,13 @@
 * from: Utah $Hdr: iteioctl.h 1.1 90/07/09$
 *
 *	@(#)iteioctl.h	7.2 (Berkeley) 11/4/90
- *	$NetBSD: iteioctl.h,v 1.8 2011/02/08 20:20:26 rmind Exp $
+ *	$NetBSD: iteioctl.h,v 1.9 2015/09/07 03:49:46 dholland Exp $
 */

 #ifndef _X68K_ITEIOCTL_H_
 #define _X68K_ITEIOCTL_H_

+#include <sys/ioccom.h>
 #include <machine/kbdmap.h>

 struct itewinsize {
--- a/sys/arch/x68k/include/kbio.h
+++ b/sys/arch/x68k/include/kbio.h
@ -1,4 +1,4 @@
-/*	$NetBSD: kbio.h,v 1.5 2006/08/28 17:15:24 he Exp $ */
+/*	$NetBSD: kbio.h,v 1.6 2015/09/07 03:49:46 dholland Exp $ */

 /*
 * Copyright (c) 1992, 1993
@ -43,6 +43,7 @@
 #ifndef _X68K_KBIO_H_
 #define _X68K_KBIO_H_

+#include <sys/ioccom.h>
 #include <dev/sun/kbio.h>

 struct kiockey {
--- a/sys/arch/x68k/include/sram.h
+++ b/sys/arch/x68k/include/sram.h
@ -1,4 +1,4 @@
-/*	$NetBSD: sram.h,v 1.3 2005/12/11 12:19:44 christos Exp $	*/
+/*	$NetBSD: sram.h,v 1.4 2015/09/07 03:49:46 dholland Exp $	*/

 /*
 * Copyright (c) 1994 Kazuhisa Shimizu.
@ -35,6 +35,8 @@

 /* This is sram device driver. */

+#include <sys/ioccom.h>
+
 #define SRAM_SIZE 16*1024	/* Sram size is 16K bytes. */
 #define SRAM_IO_SIZE 16		/* IO size */

--- a/sys/arch/x68k/x68k/clockioctl.h
+++ b/sys/arch/x68k/x68k/clockioctl.h
@ -1,4 +1,4 @@
-/*	$NetBSD: clockioctl.h,v 1.4 2011/02/08 20:20:26 rmind Exp $	*/
+/*	$NetBSD: clockioctl.h,v 1.5 2015/09/07 03:49:46 dholland Exp $	*/

 /*
 * Copyright (c) 1989 University of Utah.
@ -38,6 +38,8 @@
 *	@(#)clockioctl.h	8.1 (Berkeley) 6/10/93
 */

+#include <sys/ioccom.h>
+
 #define	CLOCKMAP	_IOWR('C', 1, int)
 #define	CLOCKUNMAP	_IOW('C', 2, int)
 #define	CLOCKGETRES	_IOR('C', 3, int)
--- a/sys/arch/xen/include/xenio.h
+++ b/sys/arch/xen/include/xenio.h
@ -1,4 +1,4 @@
-/*	$NetBSD: xenio.h,v 1.9 2011/01/10 11:13:03 cegger Exp $	*/
+/*	$NetBSD: xenio.h,v 1.10 2015/09/07 03:49:46 dholland Exp $	*/

 /******************************************************************************
 * privcmd.h
@ -32,6 +32,9 @@

 /* Interface to /proc/xen/privcmd */

+#include <sys/ioccom.h>
+
+
 typedef struct privcmd_hypercall
 {
    unsigned long op;
--- a/sys/arch/xen/include/xenio3.h
+++ b/sys/arch/xen/include/xenio3.h
@ -1,4 +1,4 @@
-/* $NetBSD: xenio3.h,v 1.3 2010/09/03 06:07:24 cegger Exp $ */
+/* $NetBSD: xenio3.h,v 1.4 2015/09/07 03:49:46 dholland Exp $ */
 /******************************************************************************
 * evtchn.h
 * 
@ -31,6 +31,8 @@
 #ifndef __XEN_XENIO3_H__
 #define __XEN_XENIO3_H__

+#include <sys/ioccom.h>
+
 /*
 * Bind a fresh port to VIRQ @virq.
 * Return allocated port.
--- a/sys/arch/xen/include/xenio_gntdev.h
+++ b/sys/arch/xen/include/xenio_gntdev.h
@ -33,6 +33,8 @@
 #ifndef __XEN_GNTDEV_H__
 #define __XEN_GNTDEV_H__

+#include <sys/ioccom.h>
+
 struct ioctl_gntdev_grant_ref {
 	/* The domain ID of the grant to be mapped. */
 	uint32_t domid;