From c8693bccf49434045fda7061d8fdb0b1681f0668 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 24 Mar 2000 21:39:09 +0000
Subject: [PATCH] Now that we have uc_device.h, use that instead of hard-coding
 struct uc_device's definition into kget.

---
 sbin/kget/Makefile |  1 -
 sbin/kget/kget.c   | 19 +------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/sbin/kget/Makefile b/sbin/kget/Makefile
index 2ce93e4183b..40320198da3 100644
--- a/sbin/kget/Makefile
+++ b/sbin/kget/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 #
 PROG=	kget
-#CFLAGS+= -I${.CURDIR}/../../sys/i386
 SRCS= 	kget.c
 MAN8=	kget.8
 
diff --git a/sbin/kget/kget.c b/sbin/kget/kget.c
index 1aebba4ef1d..a5572c85b46 100644
--- a/sbin/kget/kget.c
+++ b/sbin/kget/kget.c
@@ -30,28 +30,11 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
+#include <machine/uc_device.h>
 #if 0
 #include <isa/pnp.h>
 #endif
 
-/*
- * Per device structure.  This just happens to resemble the old isa_device
- * but that is by accident.  It is NOT the same.
- */
-struct	uc_device {
-	int	id_id;		/* device id */
-	char	*id_name;	/* device name */
-	int	id_iobase;	/* base i/o address */
-	u_int	id_irq;		/* interrupt request */
-	int	id_drq;		/* DMA request */
-	caddr_t	id_maddr;	/* physical i/o memory address on bus (if any)*/
-	int	id_msize;	/* size of i/o memory */
-	int	id_unit;	/* unit number */
-	int	id_flags;	/* flags */
-	int	id_enabled;	/* is device enabled */
-	struct	uc_device *id_next;	/* used in uc_devlist in userconfig() */
-};
-
 struct uc_device *id;
 struct pnp_cinfo *c;
 char *p;