diff options
| author |   jsg <jsg@openbsd.org> | 2014-11-06 05:48:42 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2014-11-06 05:48:42 +0000 |
| commit | b872dcec47c5ecaab82b70f64f498df24522aaae (patch) | |
| tree | cba019e54b555ae1c9c45bce262d82eab15ba97a | |
| parent | Remove unneeded netinet6/ip6_divert.h include. (diff) | |
| download | wireguard-openbsd-b872dcec47c5ecaab82b70f64f498df24522aaae.tar.xz wireguard-openbsd-b872dcec47c5ecaab82b70f64f498df24522aaae.zip | |
Add the required includes for the conditional parts of
struct vga_pci_softc in vga_pcivar.h
Original diff from guenther@ changed to incorporate feedback
from kettenis@ and myself.
| -rw-r--r-- | sys/dev/pci/agp_i810.c | 10 | ||||
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_drv.h | 13 | ||||
| -rw-r--r-- | sys/dev/pci/vga_pci_common.c | 9 |
3 files changed, 28 insertions, 4 deletions
diff --git a/sys/dev/pci/agp_i810.c b/sys/dev/pci/agp_i810.c index 960a0020e49..4dab7b8fc74 100644 --- a/sys/dev/pci/agp_i810.c +++ b/sys/dev/pci/agp_i810.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agp_i810.c,v 1.88 2014/09/06 06:00:54 jsg Exp $ */ +/* $OpenBSD: agp_i810.c,v 1.89 2014/11/06 05:48:42 jsg Exp $ */ /*- * Copyright (c) 2000 Doug Rabson @@ -28,6 +28,10 @@ * */ +#include "acpi.h" +#include "drm.h" +#include "vga.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> @@ -39,6 +43,10 @@ #include <dev/pci/pcidevs.h> #include <dev/pci/agpvar.h> #include <dev/pci/agpreg.h> +#include <dev/ic/mc6845reg.h> +#include <dev/ic/pcdisplayvar.h> +#include <dev/ic/vgareg.h> +#include <dev/ic/vgavar.h> #include <dev/pci/vga_pcivar.h> #include <machine/bus.h> diff --git a/sys/dev/pci/drm/i915/i915_drv.h b/sys/dev/pci/drm/i915/i915_drv.h index 60537ee53d9..b5e355d9efe 100644 --- a/sys/dev/pci/drm/i915/i915_drv.h +++ b/sys/dev/pci/drm/i915/i915_drv.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i915_drv.h,v 1.52 2014/05/12 19:29:16 kettenis Exp $ */ +/* $OpenBSD: i915_drv.h,v 1.53 2014/11/06 05:48:42 jsg Exp $ */ /* i915_drv.h -- Private header for the I915 driver -*- linux-c -*- */ /* @@ -36,14 +36,21 @@ #include "intel_bios.h" #include "intel_ringbuffer.h" +#include "acpi.h" +#include "drm.h" +#include "vga.h" + +#include <dev/ic/mc6845reg.h> +#include <dev/ic/pcdisplayvar.h> +#include <dev/ic/vgareg.h> +#include <dev/ic/vgavar.h> + #include <sys/task.h> #include <dev/pci/vga_pcivar.h> #include <dev/wscons/wsconsio.h> #include <dev/wscons/wsdisplayvar.h> #include <dev/rasops/rasops.h> -#include "acpi.h" - struct intel_gtt { /* Size of memory reserved for graphics by the BIOS */ unsigned int stolen_size; diff --git a/sys/dev/pci/vga_pci_common.c b/sys/dev/pci/vga_pci_common.c index e785709ce04..8d2f392ceae 100644 --- a/sys/dev/pci/vga_pci_common.c +++ b/sys/dev/pci/vga_pci_common.c @@ -14,7 +14,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include "vga.h" #include "drm.h" +#if defined(__i386__) || defined(__amd64__) +#include "acpi.h" +#endif #include <sys/param.h> #include <sys/systm.h> @@ -25,6 +29,11 @@ #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/ic/vgavar.h> #include <dev/pci/vga_pcivar.h> #include <dev/pci/drm/i915/i915_devlist.h> |