From 8080d4d196e7f8b84191a75745200e1987a2fc41 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 8 Jan 2005 22:43:33 +0000
Subject: [PATCH] Remove vnode.h and adjust includes to compensate for
 pollution.

---
 sys/dev/bktr/bktr_audio.c | 4 +++-
 sys/dev/bktr/bktr_card.c  | 4 +++-
 sys/dev/bktr/bktr_core.c  | 6 ++++--
 sys/dev/bktr/bktr_os.c    | 1 -
 sys/dev/bktr/bktr_tuner.c | 4 +++-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/sys/dev/bktr/bktr_audio.c b/sys/dev/bktr/bktr_audio.c
index 68bf40b48c6..234b37a5d7c 100644
--- a/sys/dev/bktr/bktr_audio.c
+++ b/sys/dev/bktr/bktr_audio.c
@@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/vnode.h>
 
 #ifdef __FreeBSD__
 
@@ -61,6 +60,9 @@ __FBSDID("$FreeBSD$");
 #include <machine/clock.h>              /* for DELAY */
 #include <pci/pcivar.h>
 #else
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/selinfo.h>
 #include <dev/pci/pcivar.h>
 #endif
 
diff --git a/sys/dev/bktr/bktr_card.c b/sys/dev/bktr/bktr_card.c
index c923aea026c..f991e3afa99 100644
--- a/sys/dev/bktr/bktr_card.c
+++ b/sys/dev/bktr/bktr_card.c
@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/vnode.h>
 
 #ifdef __FreeBSD__
 
@@ -59,6 +58,9 @@ __FBSDID("$FreeBSD$");
 #include <machine/clock.h>              /* for DELAY */
 #include <pci/pcivar.h>
 #else
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/selinfo.h>
 #include <dev/pci/pcivar.h>
 #endif
 
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index d8b381fdf86..276d22509ac 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -107,11 +107,13 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/fcntl.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/signalvar.h>
-#include <sys/vnode.h>
+#include <sys/selinfo.h>
+#include <sys/uio.h>
 
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
@@ -1258,7 +1260,7 @@ vbi_read(bktr_ptr_t bktr, struct uio *uio, int ioflag)
 	LOCK_VBI(bktr);
 
 	while(bktr->vbisize == 0) {
-		if (ioflag & IO_NDELAY) {
+		if (ioflag & FNDELAY) {
 			status = EWOULDBLOCK;
 			goto out;
 		}
diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c
index 87d4ed97d73..5dfcd0113b7 100644
--- a/sys/dev/bktr/bktr_os.c
+++ b/sys/dev/bktr/bktr_os.c
@@ -72,7 +72,6 @@ __FBSDID("$FreeBSD$");
 #else
 #include <sys/select.h>
 #endif
-#include <sys/vnode.h>
 
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
diff --git a/sys/dev/bktr/bktr_tuner.c b/sys/dev/bktr/bktr_tuner.c
index 424643ff23e..8b928287727 100644
--- a/sys/dev/bktr/bktr_tuner.c
+++ b/sys/dev/bktr/bktr_tuner.c
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/vnode.h>
 #ifdef __NetBSD__
 #include <sys/proc.h>
 #endif
@@ -56,6 +55,9 @@ __FBSDID("$FreeBSD$");
 #include <machine/clock.h>              /* for DELAY */
 #include <pci/pcivar.h>
 #else
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/selinfo.h>
 #include <dev/pci/pcivar.h>
 #endif