7 files changed, 19 insertions, 19 deletions

diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 0c0ac6b89700..78840277c40e 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -21,7 +21,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: if_de.c,v 1.12 1994/12/22 21:56:19 wollman Exp $
+ * $Id: if_de.c,v 1.13 1994/12/22 23:42:25 davidg Exp $
  *
  */
 
@@ -78,10 +78,10 @@
 
 #include <pci.h>
 #if NPCI > 0
-#include <i386/pci/pcireg.h>
+#include <pci/pcireg.h>
 #endif
 #include <i386/isa/icu.h>
-#include <i386/pci/dc21040.h>
+#include <pci/dc21040.h>
 
 /*
  * This module supports the DEC DC21040 PCI Ethernet Controller.
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index 6ef71637bf56..8bbd36ea3eae 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pci.c,v 1.8 1994/10/25 23:09:08 se Exp $
+**  $Id: pci.c,v 1.9 1994/11/02 23:47:13 se Exp $
 **
 **  General subroutines for the PCI bus on 80*86 systems.
 **  pci_configure ()
@@ -63,7 +63,7 @@
 #include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/icu.h>
-#include <i386/pci/pcireg.h>
+#include <pci/pcireg.h>
 
 #ifdef __FreeBSD2__
 #include <sys/devconf.h>
diff --git a/sys/pci/aic7870.c b/sys/pci/aic7870.c
index 373fea584408..6c565faf7546 100644
--- a/sys/pci/aic7870.c
+++ b/sys/pci/aic7870.c
@@ -19,7 +19,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: aic7870.c,v 1.2 1995/01/16 16:31:57 gibbs Exp $
+ *	$Id: aic7870.c,v 1.3 1995/01/22 00:47:50 gibbs Exp $
  */
 
 #include <pci.h>
@@ -28,7 +28,7 @@
 #include <sys/systm.h>
 #include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
-#include <i386/pci/pcireg.h>
+#include <pci/pcireg.h>
 #include <i386/scsi/aic7xxx.h>
 
 #define PCI_BASEADR0	PCI_MAP_REG_START
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index 0c0ac6b89700..78840277c40e 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -21,7 +21,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: if_de.c,v 1.12 1994/12/22 21:56:19 wollman Exp $
+ * $Id: if_de.c,v 1.13 1994/12/22 23:42:25 davidg Exp $
  *
  */
 
@@ -78,10 +78,10 @@
 
 #include <pci.h>
 #if NPCI > 0
-#include <i386/pci/pcireg.h>
+#include <pci/pcireg.h>
 #endif
 #include <i386/isa/icu.h>
-#include <i386/pci/dc21040.h>
+#include <pci/dc21040.h>
 
 /*
  * This module supports the DEC DC21040 PCI Ethernet Controller.
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index 8a10ddd2c65a..bf6ab03934dc 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: ncr.c,v 1.13 1994/11/28 23:18:46 se Exp $
+**  $Id: ncr.c,v 1.14 1995/01/12 14:01:13 se Exp $
 **
 **  Device driver for the   NCR 53C810   PCI-SCSI-Controller.
 **
@@ -169,13 +169,13 @@
 #include <vm/vm.h>
 #endif /* KERNEL */
 
-#include <i386/pci/ncrreg.h>
+#include <pci/ncrreg.h>
 
 #ifdef __NetBSD__
 #include <sys/device.h>
 #include <i386/pci/pcivar.h>
 #endif /* __NetBSD */
-#include <i386/pci/pcireg.h>
+#include <pci/pcireg.h>
 
 #include <scsi/scsi_all.h>
 #include <scsi/scsiconf.h>
@@ -1222,7 +1222,7 @@ static	void	ncr_attach	(pcici_t tag, int unit);
 
 
 static char ident[] =
-	"\n$Id: ncr.c,v 1.13 1994/11/28 23:18:46 se Exp $\n";
+	"\n$Id: ncr.c,v 1.14 1995/01/12 14:01:13 se Exp $\n";
 
 u_long	ncr_version = NCR_VERSION
 	+ (u_long) sizeof (struct ncb)
@@ -3333,7 +3333,7 @@ static	void ncr_attach (pcici_t config_id, int unit)
 		ncr_name (np));
 	DELAY (1000000);
 #endif
-	printf ("%s scanning for targets 0..%d ($Revision: 1.13 $)\n",
+	printf ("%s scanning for targets 0..%d ($Revision: 1.14 $)\n",
 		ncr_name (np), MAX_TARGET-1);
 
 	/*
diff --git a/sys/pci/pci.c b/sys/pci/pci.c
index 6ef71637bf56..8bbd36ea3eae 100644
--- a/sys/pci/pci.c
+++ b/sys/pci/pci.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pci.c,v 1.8 1994/10/25 23:09:08 se Exp $
+**  $Id: pci.c,v 1.9 1994/11/02 23:47:13 se Exp $
 **
 **  General subroutines for the PCI bus on 80*86 systems.
 **  pci_configure ()
@@ -63,7 +63,7 @@
 #include <i386/isa/isa.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/icu.h>
-#include <i386/pci/pcireg.h>
+#include <pci/pcireg.h>
 
 #ifdef __FreeBSD2__
 #include <sys/devconf.h>
diff --git a/sys/pci/pcisupport.c b/sys/pci/pcisupport.c
index 21a25a558923..16694653bc0d 100644
--- a/sys/pci/pcisupport.c
+++ b/sys/pci/pcisupport.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcisupport.c,v 1.5 1994/10/25 18:45:19 se Exp $
+**  $Id: pcisupport.c,v 1.6 1994/12/22 21:20:39 se Exp $
 **
 **  Device driver for INTEL PCI chipsets.
 **
@@ -51,7 +51,7 @@
 
 #include <sys/types.h>
 
-#include <i386/pci/pcireg.h>
+#include <pci/pcireg.h>
 
 extern	void	printf();