diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1996-09-21 14:59:43 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1996-09-21 14:59:43 +0000 |
| commit | ebedb5ad97718c0a271659c2563834837607f03f (patch) | |
| tree | e03f53db0e9dc53fdad8b0a593af598744be17da /sys/dev | |
| parent | 83f52dababadc2c364a5ad22dbef8ea4e197530c (diff) | |
Notes
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/bktr/ioctl_meteor.h | 11 | ||||
| -rw-r--r-- | sys/dev/ppbus/lptio.h | 11 | ||||
| -rw-r--r-- | sys/dev/speaker/speaker.h | 12 |
3 files changed, 17 insertions, 17 deletions
diff --git a/sys/dev/bktr/ioctl_meteor.h b/sys/dev/bktr/ioctl_meteor.h index f4325504e723..919100f8d534 100644 --- a/sys/dev/bktr/ioctl_meteor.h +++ b/sys/dev/bktr/ioctl_meteor.h @@ -32,10 +32,13 @@ * ioctl constants for Matrox Meteor Capture card. */ -#ifndef _MACHINE_IOCTL_METEOR_H -#define _MACHINE_IOCTL_METEOR_H +#ifndef _MACHINE_IOCTL_METEOR_H_ +#define _MACHINE_IOCTL_METEOR_H_ -#include <sys/ioctl.h> +#ifndef KERNEL +#include <sys/types.h> +#endif +#include <sys/ioccom.h> struct meteor_capframe { short command; /* see below for valid METEORCAPFRM commands */ @@ -179,4 +182,4 @@ struct meteor_mem { caddr_t buf; /* The real space (virtual addr) */ } ; -#endif /* ifndef _MACHINE_IOCTL_METEOR_H */ +#endif /* !_MACHINE_IOCTL_METEOR_H_ */ diff --git a/sys/dev/ppbus/lptio.h b/sys/dev/ppbus/lptio.h index a203c7d69d54..14ea3d325534 100644 --- a/sys/dev/ppbus/lptio.h +++ b/sys/dev/ppbus/lptio.h @@ -11,15 +11,14 @@ * * Geoff Rehmet, Rhodes University, South Africa <csgr@cs.ru.ac.za> * - * $Id: lpt.h,v 1.2 1994/08/02 07:38:52 davidg Exp $ + * $Id: lpt.h,v 1.3 1995/05/30 08:00:41 rgrimes Exp $ */ -#ifndef _LPT_PRINTER_H_ -#define _LPT_PRINTER_H_ +#ifndef _MACHINE_LPT_H_ +#define _MACHINE_LPT_H_ -#include <sys/types.h> -#include <sys/ioctl.h> +#include <sys/ioccom.h> #define LPT_IRQ _IOW('p', 1, long) /* set interrupt status */ -#endif +#endif /* !_MACHINE_LPT_H_ */ diff --git a/sys/dev/speaker/speaker.h b/sys/dev/speaker/speaker.h index f097e4807cf8..7a233c712a0c 100644 --- a/sys/dev/speaker/speaker.h +++ b/sys/dev/speaker/speaker.h @@ -4,13 +4,13 @@ * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993 * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su> * - * $Id$ + * $Id: speaker.h,v 1.2 1994/08/02 07:39:05 davidg Exp $ */ -#ifndef _SPEAKER_H_ -#define _SPEAKER_H_ +#ifndef _MACHINE_SPEAKER_H_ +#define _MACHINE_SPEAKER_H_ -#include <sys/ioctl.h> +#include <sys/ioccom.h> #define SPKRTONE _IOW('S', 1, tone_t) /* emit tone */ #define SPKRTUNE _IO('S', 2) /* emit tone sequence*/ @@ -27,6 +27,4 @@ tone_t; * see the spkr(4) man page for details. */ -#endif /* _SPEAKER_H_ */ - -/* speaker.h ends here */ +#endif /* !_MACHINE_SPEAKER_H_ */ |