From 1d582fe3200d802cab8cb2e85dcd79d1e43f081d Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Sat, 20 Dec 2003 17:12:25 +0000
Subject: [PATCH] Make the multiple include guard correct for this file
 location. This fixes a bug where the guard conflicted with machine/ioctl_*.

---
 sys/dev/bktr/ioctl_bt848.h  | 6 +++---
 sys/dev/bktr/ioctl_meteor.h | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/dev/bktr/ioctl_bt848.h b/sys/dev/bktr/ioctl_bt848.h
index b6646c699b7..3731e7d2b34 100644
--- a/sys/dev/bktr/ioctl_bt848.h
+++ b/sys/dev/bktr/ioctl_bt848.h
@@ -4,8 +4,8 @@
  * $FreeBSD$
  */
 
-#ifndef  _MACHINE_IOCTL_BT848_H_
-#define  _MACHINE_IOCTL_BT848_H_
+#ifndef  _DEV_BKTR_IOCTL_BT848_H_
+#define  _DEV_BKTR_IOCTL_BT848_H_
 
 /*
  * frequency sets
@@ -294,5 +294,5 @@ struct bktr_remote {
 # define BT848_IFORM_F_AUTO             (0x0)
 
 
-#endif	/* _MACHINE_IOCTL_BT848_H_ */
+#endif	/* _DEV_BKTR_IOCTL_BT848_H_ */
 
diff --git a/sys/dev/bktr/ioctl_meteor.h b/sys/dev/bktr/ioctl_meteor.h
index f62d392ea0a..5f70a4b87ec 100644
--- a/sys/dev/bktr/ioctl_meteor.h
+++ b/sys/dev/bktr/ioctl_meteor.h
@@ -34,8 +34,8 @@
  *	ioctl constants for Matrox Meteor Capture card.
  */
 
-#ifndef	_MACHINE_IOCTL_METEOR_H_
-#define	_MACHINE_IOCTL_METEOR_H_
+#ifndef	_DEV_BKTR_IOCTL_METEOR_H_
+#define	_DEV_BKTR_IOCTL_METEOR_H_
 
 #ifndef _KERNEL
 #include <sys/types.h>
@@ -184,4 +184,4 @@ struct meteor_mem {
 	caddr_t	buf;		 /* The real space (virtual addr) */
 } ;
 
-#endif /* !_MACHINE_IOCTL_METEOR_H_ */
+#endif /* !_DEV_BKTR_IOCTL_METEOR_H_ */