From edbfbd92808d61a73f4fa6869a7110c4d102a3a1 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Mon, 30 Sep 1996 11:25:19 +0000
Subject: [PATCH] Whaddya know, visual userconfig sort of supports pci, but the
 support was always disabled because "pci.h" wasn't included.  Now the
 configured pci devices are listed and you can edit bogus flags for them.

Fixed bitrot in the disabled code.  A used #include was removed and const
poisoning wasn't fixed.

Removed unused #include.
---
 sys/i386/i386/userconfig.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c
index 4b5a0ba99f7..fb2091b2153 100644
--- a/sys/i386/i386/userconfig.c
+++ b/sys/i386/i386/userconfig.c
@@ -46,7 +46,7 @@
  ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  **
- **      $Id: userconfig.c,v 1.46 1996/09/15 19:35:23 phk Exp $
+ **      $Id: userconfig.c,v 1.47 1996/09/19 08:32:37 phk Exp $
  **/
 
 /**
@@ -104,12 +104,13 @@
  **/
 
 #include "opt_userconfig.h"
+#include "pci.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/malloc.h>
 
-#include <machine/clock.h>
 #include <machine/cons.h>
 #include <machine/md_var.h>
 
@@ -380,9 +381,9 @@ getdevs(void)
     {
 	if (pcidevice_set.ls_items[i])
 	{
-	    if (((struct pci_device *)pcidevice_set.ls_items[i])->pd_name)
+	    if (((const struct pci_device *)pcidevice_set.ls_items[i])->pd_name)
 	    {
-		strcpy(scratch.dev,((struct pci_device *)pcidevice_set.ls_items[i])->pd_name);
+		strcpy(scratch.dev,((const struct pci_device *)pcidevice_set.ls_items[i])->pd_name);
 		scratch.iobase = -2;			/* mark as PCI for future reference */
 		scratch.irq = -2;
 		scratch.drq = -2;
@@ -2154,7 +2155,7 @@ visuserconfig(void)
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: userconfig.c,v 1.46 1996/09/15 19:35:23 phk Exp $
+ *      $Id: userconfig.c,v 1.47 1996/09/19 08:32:37 phk Exp $
  */
 
 #include "scbus.h"