From 1e505cea7d27e239695a4a210b0d0a2dd0f721ea Mon Sep 17 00:00:00 2001
From: Mike Smith <msmith@FreeBSD.org>
Date: Thu, 28 Aug 1997 10:15:20 +0000
Subject: [PATCH] Remove bogus i386/* includes.

---
 sys/dev/ppbus/nlpt.c     | 7 ++-----
 sys/dev/ppbus/ppb_base.c | 6 +-----
 sys/dev/ppbus/ppbconf.c  | 6 +-----
 sys/dev/ppbus/ppi.c      | 5 +----
 sys/dev/ppbus/vpo.c      | 3 +--
 5 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/sys/dev/ppbus/nlpt.c b/sys/dev/ppbus/nlpt.c
index 8e9ed3944c6..1f070865c75 100644
--- a/sys/dev/ppbus/nlpt.c
+++ b/sys/dev/ppbus/nlpt.c
@@ -47,7 +47,7 @@
  *
  *	from: unknown origin, 386BSD 0.1
  *	From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp
- *	$Id: nlpt.c,v 1.1 1997/08/14 13:57:40 msmith Exp $
+ *	$Id: nlpt.c,v 1.2 1997/08/16 14:05:31 msmith Exp $
  */
 
 /*
@@ -80,9 +80,6 @@
 #include <machine/clock.h>
 #include <machine/lpt.h>
 
-#include <i386/isa/isa.h>
-#include <i386/isa/isa_device.h>
-
 #include <sys/kernel.h>
 #endif /*KERNEL */
 
@@ -249,7 +246,7 @@ nlpt_detect(struct lpt_data *lpt)
 	u_char		mask;
 	int		i, error;
 
-	status = IO_LPTSIZE;
+	status = 1;				/* assume success */
 
 	if ((error = lpt_request_ppbus(lpt, PPB_DONTWAIT))) {
 		printf("nlpt: cannot alloc ppbus (%d)!\n", error);
diff --git a/sys/dev/ppbus/ppb_base.c b/sys/dev/ppbus/ppb_base.c
index 99d24464c74..97aee424e6a 100644
--- a/sys/dev/ppbus/ppb_base.c
+++ b/sys/dev/ppbus/ppb_base.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: ppb_base.c,v 1.1 1997/08/16 14:05:34 msmith Exp $
  *
  */
 #include <sys/param.h>
@@ -38,15 +38,11 @@
 #include <sys/syslog.h>
 
 #include <machine/clock.h>
-#include <machine/lpt.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 
-#include <i386/isa/isa.h>
-#include <i386/isa/isa_device.h>
-
 #include <dev/ppbus/ppbconf.h>
 
 /*
diff --git a/sys/dev/ppbus/ppbconf.c b/sys/dev/ppbus/ppbconf.c
index b72012c7778..49c93f62945 100644
--- a/sys/dev/ppbus/ppbconf.c
+++ b/sys/dev/ppbus/ppbconf.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppbconf.c,v 1.1 1997/08/14 13:57:41 msmith Exp $
+ *	$Id: ppbconf.c,v 1.2 1997/08/16 14:05:35 msmith Exp $
  *
  */
 #include <sys/param.h>
@@ -38,15 +38,11 @@
 #include <sys/syslog.h>
 
 #include <machine/clock.h>
-#include <machine/lpt.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 
-#include <i386/isa/isa.h>
-#include <i386/isa/isa_device.h>
-
 #include <dev/ppbus/ppbconf.h>
 #include <dev/ppbus/ppb_1284.h>
 
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index c0f6c6f3a48..aaf54b31f06 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppi.c,v 1.2 1997/08/16 14:05:36 msmith Exp $
+ *	$Id: ppi.c,v 1.3 1997/08/16 14:16:58 msmith Exp $
  *
  */
 #include "ppi.h"
@@ -46,9 +46,6 @@
 #include <machine/stdarg.h>
 #include <machine/clock.h>
 
-#include <i386/isa/isa.h>
-#include <i386/isa/isa_device.h>
-
 #include <sys/kernel.h>
 #endif /*KERNEL */
 
diff --git a/sys/dev/ppbus/vpo.c b/sys/dev/ppbus/vpo.c
index 61eb4c69f37..15cd706d3f7 100644
--- a/sys/dev/ppbus/vpo.c
+++ b/sys/dev/ppbus/vpo.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: vpo.c,v 1.1 1997/08/14 13:57:44 msmith Exp $
+ *	$Id: vpo.c,v 1.2 1997/08/16 14:05:37 msmith Exp $
  *
  */
 #include <sys/types.h>
@@ -40,7 +40,6 @@
 #include <machine/stdarg.h>
 #include <machine/clock.h>
 
-#include <i386/isa/isa_device.h>
 #endif	/* KERNEL */
 #include <scsi/scsi_all.h>
 #include <scsi/scsi_disk.h>