Move the bktr(4) <arch>/include/ioctl_{bt848,meteor}.h files to dev/bktr

as these ioctl's aren't MD.  This also means they are installed in
/usr/include/dev/bktr now.  Also provide compatability wrappers for
where these headers lived in 4.x.

5 files changed, 21 insertions, 10 deletions

diff --git a/share/examples/meteor/rgb16.c b/share/examples/meteor/rgb16.c
index 4c7ee07..a3e965f 100644
--- a/share/examples/meteor/rgb16.c
+++ b/share/examples/meteor/rgb16.c
@@ -29,11 +29,14 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/fcntl.h>
-/*#include <machine/ioctl_meteor.h>*/
-#include "/sys/i386/include/ioctl_meteor.h"
+#include <dev/bktr/ioctl_meteor.h>
 
 extern int errno;
 #define ROWS 480
diff --git a/share/examples/meteor/rgb24.c b/share/examples/meteor/rgb24.c
index f296902..ef9dfe7 100644
--- a/share/examples/meteor/rgb24.c
+++ b/share/examples/meteor/rgb24.c
@@ -29,9 +29,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/fcntl.h>
-/*#include <machine/ioctl_meteor.h>*/
-#include "/sys/i386/include/ioctl_meteor.h"
+#include <dev/bktr/ioctl_meteor.h>
 
 extern int errno;
 #define ROWS 300
diff --git a/share/examples/meteor/test-n.c b/share/examples/meteor/test-n.c
index 4651654..2288957 100644
--- a/share/examples/meteor/test-n.c
+++ b/share/examples/meteor/test-n.c
@@ -42,11 +42,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/fcntl.h>
-/*#include <machine/ioctl_meteor.h> */
-#include "/sys/i386/include/ioctl_meteor.h"
+#include <dev/bktr/ioctl_meteor.h>
 
 typedef unsigned char uint8;
 typedef signed char int8;
diff --git a/share/examples/meteor/yuvpk.c b/share/examples/meteor/yuvpk.c
index 6ebd2e4..c9efec3 100644
--- a/share/examples/meteor/yuvpk.c
+++ b/share/examples/meteor/yuvpk.c
@@ -29,11 +29,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/fcntl.h>
-/*#include <machine/ioctl_meteor.h>*/
-#include "/sys/i386/include/ioctl_meteor.h"
+#include <dev/bktr/ioctl_meteor.h>
 
 typedef unsigned char uint8;
 typedef signed char int8;
diff --git a/share/examples/meteor/yuvpl.c b/share/examples/meteor/yuvpl.c
index 704dfce..9e69465 100644
--- a/share/examples/meteor/yuvpl.c
+++ b/share/examples/meteor/yuvpl.c
@@ -29,11 +29,13 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/fcntl.h>
-/*#include <machine/ioctl_meteor.h>*/                             
-#include "/sys/i386/include/ioctl_meteor.h"                   
+#include <dev/bktr/ioctl_meteor.h>
 
 
 typedef unsigned char uint8;