From d29b0e3442bd2980c7cf18e817c695046a25a923 Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Fri, 22 Aug 2003 06:06:16 +0000
Subject: Prefer new location of pci include files (which have only been in the
 tree for two or more years now), except in a few places where there's code to
 be compatible with older versions of FreeBSD.

---
 sys/dev/acpica/acpi_pcib.c      | 4 ++--
 sys/dev/acpica/acpi_pcib_acpi.c | 4 ++--
 sys/dev/acpica/acpi_pcib_pci.c  | 6 +++---
 sys/dev/acpica/acpi_timer.c     | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'sys/dev/acpica')

diff --git a/sys/dev/acpica/acpi_pcib.c b/sys/dev/acpica/acpi_pcib.c
index ac274a4cd..81f3a0b 100644
--- a/sys/dev/acpica/acpi_pcib.c
+++ b/sys/dev/acpica/acpi_pcib.c
@@ -38,8 +38,8 @@
 #include <dev/acpica/acpi_pcibvar.h>
 
 #include <machine/pci_cfgreg.h>
-#include <pci/pcivar.h>
-#include <pci/pcib_private.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcib_private.h>
 #include "pcib_if.h"
 
 /*
diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c
index ba6e42e..637d7fb 100644
--- a/sys/dev/acpica/acpi_pcib_acpi.c
+++ b/sys/dev/acpica/acpi_pcib_acpi.c
@@ -37,8 +37,8 @@
 #include <dev/acpica/acpivar.h>
 
 #include <machine/pci_cfgreg.h>
-#include <pci/pcivar.h>
-#include <pci/pcib_private.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcib_private.h>
 #include "pcib_if.h"
 
 #include <dev/acpica/acpi_pcibvar.h>
diff --git a/sys/dev/acpica/acpi_pcib_pci.c b/sys/dev/acpica/acpi_pcib_pci.c
index 5909e65..dff2450 100644
--- a/sys/dev/acpica/acpi_pcib_pci.c
+++ b/sys/dev/acpica/acpi_pcib_pci.c
@@ -39,9 +39,9 @@
 #include <dev/acpica/acpi_pcibvar.h>
 
 #include <machine/pci_cfgreg.h>
-#include <pci/pcivar.h>
-#include <pci/pcireg.h>
-#include <pci/pcib_private.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcib_private.h>
 
 #include "pcib_if.h"
 
diff --git a/sys/dev/acpica/acpi_timer.c b/sys/dev/acpica/acpi_timer.c
index 576ce59..61edc05 100644
--- a/sys/dev/acpica/acpi_timer.c
+++ b/sys/dev/acpica/acpi_timer.c
@@ -44,7 +44,7 @@
 #include "acpi.h"
 
 #include <dev/acpica/acpivar.h>
-#include <pci/pcivar.h>
+#include <dev/pci/pcivar.h>
 
 /*
  * A timecounter based on the free-running ACPI timer.
-- 
cgit v1.1