From ab7136136404f98d04e796d71a623c76fad60f85 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Sat, 20 Sep 1997 06:26:28 +0000
Subject: [PATCH] Adjust the #ifdef KERNEL so that pnp_cinfo is available for
 sbin/dset.c Other ways around this might be to #define KERNEL in dset.c for
 the "i386/isa/pnp.h" include.

---
 sys/i386/isa/pnp.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys/i386/isa/pnp.h b/sys/i386/isa/pnp.h
index 29acd02c110..8a0432cf707 100644
--- a/sys/i386/isa/pnp.h
+++ b/sys/i386/isa/pnp.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: pnp.h,v 1.2 1997/09/18 08:04:13 jmg Exp $
+ *      $Id: pnp.h,v 1.3 1997/09/19 15:20:25 jmg Exp $
  */
 
 #ifndef _I386_ISA_PNP_H_
@@ -228,10 +228,6 @@
 #define _32BIT_FIXED_LOC_DESC	0x6
 #define LG_RES_RESERVED		0x7-0x7f
 
-#ifdef KERNEL
-
-#include <i386/isa/isa_device.h>
-
 /*
  * pnp_cinfo contains Configuration Information. They are used
  * to communicate to the device driver the actual configuration
@@ -258,6 +254,10 @@ struct pnp_cinfo {
 	} mem[4];
 };
 
+#ifdef KERNEL
+
+#include <i386/isa/isa_device.h>
+
 struct pnp_device {
     char *pd_name;
     char * (*pd_probe ) (u_long csn, u_long vendor_id);