From 10884719f8216125848e0356d3f628ee247050f9 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Sat, 13 Mar 2004 19:19:13 +0000
Subject: [PATCH] MFi386: nuke pci_cfgintr

---
 sys/amd64/include/pci_cfgreg.h |  1 -
 sys/amd64/pci/pci_cfgreg.c     | 23 +----------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/sys/amd64/include/pci_cfgreg.h b/sys/amd64/include/pci_cfgreg.h
index 4366f70ad4b6..10cdb96ac2ce 100644
--- a/sys/amd64/include/pci_cfgreg.h
+++ b/sys/amd64/include/pci_cfgreg.h
@@ -45,4 +45,3 @@
 int		pci_cfgregopen(void);
 u_int32_t	pci_cfgregread(int bus, int slot, int func, int reg, int bytes);
 void		pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes);
-int		pci_cfgintr(int bus, int device, int pin, int oldirq);
diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c
index ec418ba5acc9..e92d02c2b499 100644
--- a/sys/amd64/pci/pci_cfgreg.c
+++ b/sys/amd64/pci/pci_cfgreg.c
@@ -29,24 +29,15 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/param.h>		/* XXX trim includes */
+#include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
-#include <sys/malloc.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
-#include <vm/vm.h>
-#include <vm/pmap.h>
-#include <machine/md_var.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
-#include <isa/isavar.h>
 #include <machine/pci_cfgreg.h>
 
-#include "pcib_if.h"
-
 static int cfgmech;
 static int devmax;
 
@@ -108,18 +99,6 @@ pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes)
 	pcireg_cfgwrite(bus, slot, func, reg, data, bytes);
 }
 
-/*
- * Route a PCI interrupt
- */
-int
-pci_cfgintr(int bus, int device, int pin, int oldirq)
-{
-
-	printf("pci_cfgintr: can't route an interrupt to %d:%d INT%c without ACPI\n", bus, 
-	    device, 'A' + pin - 1);
-	return (PCI_INVALID_IRQ);
-}
-
 /* 
  * Configuration space access using direct register operations
  */