[src/trunk]: src/sys/dev/pci/bktr remove unnecessary #ifdef __NetBSD__'s in #...

[wiz <wiz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/dfc7835e49e0
branches:  trunk
changeset: 494087:dfc7835e49e0
user:      wiz <wiz%NetBSD.org@localhost>
date:      Sat Jul 01 01:53:37 2000 +0000

description:
remove unnecessary #ifdef __NetBSD__'s in #ifdef __FreeBSD__;
move one #include <vm/vm.h> into #ifndef __NetBSD__

diffstat:

 sys/dev/pci/bktr/bktr_core.c |  11 +----------
 sys/dev/pci/bktr/bktr_os.c   |  12 ++----------
 2 files changed, 3 insertions(+), 20 deletions(-)

diffs (67 lines):

diff -r a61a7dd48b16 -r dfc7835e49e0 sys/dev/pci/bktr/bktr_core.c
--- a/sys/dev/pci/bktr/bktr_core.c      Sat Jul 01 01:38:58 2000 +0000
+++ b/sys/dev/pci/bktr/bktr_core.c      Sat Jul 01 01:53:37 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bktr_core.c,v 1.8 2000/07/01 01:39:01 wiz Exp $        */
+/*     $NetBSD: bktr_core.c,v 1.9 2000/07/01 01:53:37 wiz Exp $        */
 
 /* FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.109 2000/06/28 15:09:12 roger Exp */
 
@@ -122,19 +122,10 @@
 #include <sys/signalvar.h>
 #include <sys/vnode.h>
 
-#ifdef __NetBSD__
-#include <uvm/uvm_extern.h>
-#else
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
-#endif
-
-/*******************/
-/* *** FreeBSD *** */
-/*******************/
-#ifdef __FreeBSD__
 
 #if (__FreeBSD_version >=400000) || (NSMBUS > 0)
 #include <sys/bus.h>           /* used by smbus and newbus */
diff -r a61a7dd48b16 -r dfc7835e49e0 sys/dev/pci/bktr/bktr_os.c
--- a/sys/dev/pci/bktr/bktr_os.c        Sat Jul 01 01:38:58 2000 +0000
+++ b/sys/dev/pci/bktr/bktr_os.c        Sat Jul 01 01:53:37 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bktr_os.c,v 1.10 2000/07/01 01:39:02 wiz Exp $ */
+/*     $NetBSD: bktr_os.c,v 1.11 2000/07/01 01:53:38 wiz Exp $ */
 
 /* FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.10 2000/06/28 15:09:12 roger Exp */
 
@@ -77,17 +77,10 @@
 #include <sys/select.h>
 #include <sys/vnode.h>
 
-#ifndef __NetBSD__
 #include <vm/vm.h>
 #include <vm/vm_kern.h>
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
-#endif
-
-/*******************/
-/* *** FreeBSD *** */
-/*******************/
-#ifdef __FreeBSD__
 
 #if (__FreeBSD_version < 400000)
 #ifdef DEVFS
@@ -164,9 +157,8 @@
 #include <sys/select.h>
 #include <sys/vnode.h>
 
+#ifndef __NetBSD__
 #include <vm/vm.h>
-
-#ifndef __NetBSD__
 #include <vm/vm_kern.h>
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>