6 files changed, 24 insertions, 24 deletions

diff --git a/sys/dev/amd/amd.c b/sys/dev/amd/amd.c
index 3d172f3d695bc..073f6267a6d07 100644
--- a/sys/dev/amd/amd.c
+++ b/sys/dev/amd/amd.c
@@ -50,10 +50,6 @@
 /* #define AMD_DEBUG0           */
 /* #define AMD_DEBUG_SCSI_PHASE */
 
-#ifndef COMPAT_OLDPCI
-#error "The amd device requires the old pci compatibility shims"
-#endif
-
 #include <sys/param.h>
 
 #include <sys/systm.h>
@@ -83,6 +79,10 @@
 
 #include <pci/amd.h>
 
+#ifndef COMPAT_OLDPCI
+#error "The amd device requires the old pci compatibility shims"
+#endif
+
 #define PCI_DEVICE_ID_AMD53C974 	0x20201022ul
 #define PCI_BASE_ADDR0	    		0x10
 
diff --git a/sys/dev/ar/if_ar_pci.c b/sys/dev/ar/if_ar_pci.c
index 9643412511cb0..6fa1d522d3d73 100644
--- a/sys/dev/ar/if_ar_pci.c
+++ b/sys/dev/ar/if_ar_pci.c
@@ -29,10 +29,6 @@
  * $FreeBSD$
  */
 
-#ifndef COMPAT_OLDPCI
-#error "The ar device requires the old pci compatibility shims"
-#endif
-
 #include "ar.h"
 
 #include <sys/param.h>
@@ -42,6 +38,10 @@
 
 #include <pci/pcivar.h>
 
+#ifndef COMPAT_OLDPCI
+#error "The ar device requires the old pci compatibility shims"
+#endif
+
 /*
  * The must match with the real functions in if_ar.c
  */
diff --git a/sys/dev/cy/cy_pci.c b/sys/dev/cy/cy_pci.c
index e52e554bc8b20..e1158d2e35e87 100644
--- a/sys/dev/cy/cy_pci.c
+++ b/sys/dev/cy/cy_pci.c
@@ -33,10 +33,6 @@
 
 #include "opt_cy_pci_fastintr.h"
 
-#ifndef COMPAT_OLDPCI
-#error "The cy device requires the old pci compatibility shims"
-#endif
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -51,6 +47,10 @@
 #include <i386/isa/intr_machdep.h>
 #endif
 
+#ifndef COMPAT_OLDPCI
+#error "The cy device requires the old pci compatibility shims"
+#endif
+
 static const char *cy_probe		__P((pcici_t, pcidi_t));
 static void cy_attach		__P((pcici_t, int));
 
diff --git a/sys/dev/en/if_en_pci.c b/sys/dev/en/if_en_pci.c
index 5212499ce2138..3a2f37a3fd957 100644
--- a/sys/dev/en/if_en_pci.c
+++ b/sys/dev/en/if_en_pci.c
@@ -45,10 +45,6 @@
  * thanks to Matt Thomas for figuring out FreeBSD vs NetBSD vs etc.. diffs.
  */
 
-#ifndef COMPAT_OLDPCI
-#error "The en device requires the old pci compatibility shims"
-#endif
-
 #include "en.h"
 
 #include <sys/param.h>
@@ -70,6 +66,10 @@
 #include <dev/en/midwayreg.h>
 #include <dev/en/midwayvar.h>
 
+#ifndef COMPAT_OLDPCI
+#error "The en device requires the old pci compatibility shims"
+#endif
+
 
 /*
  * prototypes
diff --git a/sys/dev/lnc/if_lnc_pci.c b/sys/dev/lnc/if_lnc_pci.c
index 19a2a07cc3338..8d8745a74d20d 100644
--- a/sys/dev/lnc/if_lnc_pci.c
+++ b/sys/dev/lnc/if_lnc_pci.c
@@ -20,10 +20,6 @@
  * $FreeBSD$
  */
 
-#ifndef COMPAT_OLDPCI
-#error "The lnc device requires the old pci compatibility shims"
-#endif
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
@@ -33,6 +29,10 @@
 
 #include "lnc.h"
 
+#ifndef COMPAT_OLDPCI
+#error "The lnc device requires the old pci compatibility shims"
+#endif
+
 #define PCI_DEVICE_ID_PCNet_PCI	0x20001022
 #define PCI_DEVICE_ID_PCHome_PCI 0x20011022
 
diff --git a/sys/dev/sr/if_sr_pci.c b/sys/dev/sr/if_sr_pci.c
index 50ddb7fcb7993..1bf8177ece7db 100644
--- a/sys/dev/sr/if_sr_pci.c
+++ b/sys/dev/sr/if_sr_pci.c
@@ -30,10 +30,6 @@
  * $FreeBSD$
  */
 
-#ifndef COMPAT_OLDPCI
-#error "The sr device requires the old pci compatibility shims"
-#endif
-
 #include "sr.h"
 
 #include <sys/param.h>
@@ -43,6 +39,10 @@
 
 #include <pci/pcivar.h>
 
+#ifndef COMPAT_OLDPCI
+#error "The sr device requires the old pci compatibility shims"
+#endif
+
 #ifndef BUGGY
 #define BUGGY		0
 #endif