From: Miod Vallat <miod@online.fr>
Subject: some simple include removals
To: tech@openbsd.org
Date: Sat, 17 Aug 2024 08:14:58 +0000

sys/dev/pci/vga_pci_common.c used to contain a lot of code, nowadays
it's only a bunch of pci device id scans, which are only used for
installation media.

The following diff removes the no longer needed includes from this file.

Index: vga_pci_common.c
===================================================================
RCS file: /OpenBSD/src/sys/dev/pci/vga_pci_common.c,v
retrieving revision 1.11
diff -u -p -r1.11 vga_pci_common.c
--- vga_pci_common.c	24 May 2024 06:02:58 -0000	1.11
+++ vga_pci_common.c	17 Aug 2024 08:13:33 -0000
@@ -1,3 +1,4 @@
+/*	$OpenBSD$	*/
 /*
  * Copyright (c) 2008 Owain G. Ainsworth <oga@nicotinebsd.org>
  *
@@ -14,33 +15,16 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "vga.h"
-#if defined(__i386__) || defined(__amd64__)
-#include "acpi.h"
-#endif
-
+#ifdef RAMDISK_HOOKS
 #include <sys/param.h>
-#include <sys/systm.h>
-
-#include <machine/bus.h>
 
-#include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 
-#include <dev/ic/mc6845reg.h>
-#include <dev/ic/pcdisplayvar.h>
-#include <dev/ic/vgareg.h>
-
-#include <dev/wscons/wsdisplayvar.h>
-#include <dev/ic/vgavar.h>
-#include <dev/pci/vga_pcivar.h>
-
 #include <dev/pci/drm/i915/i915_devlist.h>
 #include <dev/pci/drm/radeon/radeon_devlist.h>
 #include <dev/pci/drm/amd/amdgpu/amdgpu_devlist.h>
 
-#ifdef RAMDISK_HOOKS
 static const struct pci_matchid aperture_blacklist[] = {
 	/* server adapters found in mga200 drm driver */
 	{ PCI_VENDOR_MATROX,	PCI_PRODUCT_MATROX_G200E_SE },