From: Tomas Hruby <tom@minix3.org>
Date: Thu, 2 Sep 2010 15:43:59 +0000 (+0000)
Subject: pci_*.h headers moved from drivers/pci to include/machine
X-Git-Tag: v3.1.8~20
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zlib_tech.html?a=commitdiff_plain;h=43a472542363b6db1726c36a1b25ad0593f024a2;p=minix.git

pci_*.h headers moved from drivers/pci to include/machine
---

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 90971452b..bfc8fedca 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -15,10 +15,10 @@ Created:	Jan 2000 by Philip Homburg <philip@cs.vu.nl>
 #include <minix/syslib.h>
 
 #include "pci.h"
-#include "pci_amd.h"
-#include "pci_intel.h"
-#include "pci_sis.h"
-#include "pci_via.h"
+#include <machine/pci_amd.h>
+#include <machine/pci_intel.h>
+#include <machine/pci_sis.h>
+#include <machine/pci_via.h>
 #if __minix_vmd
 #include "config.h"
 #endif
diff --git a/include/arch/i386/Makefile b/include/arch/i386/Makefile
index 5fd9edfbd..ac1f1b8e0 100644
--- a/include/arch/i386/Makefile
+++ b/include/arch/i386/Makefile
@@ -1,7 +1,8 @@
 INCSDIR= /usr/include/i386
 
 INCS=	archtypes.h bios.h cmos.h cpu.h diskparm.h fpu.h int86.h \
-	interrupt.h mcontext.h memory.h partition.h pci.h ports.h \
-	stackframe.h vm.h asm.h
+	interrupt.h mcontext.h memory.h partition.h \
+	pci.h pci_amd.h pci_intel.h pci_sis.h pci_via.h \
+	ports.h stackframe.h vm.h
 
 .include <bsd.kinc.mk>
diff --git a/drivers/pci/pci_amd.h b/include/arch/i386/pci_amd.h
similarity index 100%
rename from drivers/pci/pci_amd.h
rename to include/arch/i386/pci_amd.h
diff --git a/drivers/pci/pci_intel.h b/include/arch/i386/pci_intel.h
similarity index 100%
rename from drivers/pci/pci_intel.h
rename to include/arch/i386/pci_intel.h
diff --git a/drivers/pci/pci_sis.h b/include/arch/i386/pci_sis.h
similarity index 100%
rename from drivers/pci/pci_sis.h
rename to include/arch/i386/pci_sis.h
diff --git a/drivers/pci/pci_via.h b/include/arch/i386/pci_via.h
similarity index 100%
rename from drivers/pci/pci_via.h
rename to include/arch/i386/pci_via.h