Per conversations in -current, add #error to these drivers when you don't

have the right compatibility shims enabled.  ISA drivers to follow later.

sys/dev/amd/amd.c

@@ -50,6 +50,10 @@
 /* #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>

sys/dev/ar/if_ar_pci.c

@@ -29,6 +29,10 @@
  * $FreeBSD$
  */
 
+#ifndef COMPAT_OLDPCI
+#error "The ar device requires the old pci compatibility shims"
+#endif
+
 #include "ar.h"
 
 #include <sys/param.h>

sys/dev/cy/cy_pci.c

@@ -33,6 +33,10 @@
 
 #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>

sys/dev/en/if_en_pci.c

@@ -45,6 +45,10 @@
  * 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>

sys/dev/lnc/if_lnc_pci.c

@@ -20,6 +20,10 @@
  * $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>

sys/dev/sr/if_sr_pci.c

@@ -30,6 +30,10 @@
  * $FreeBSD$
  */
 
+#ifndef COMPAT_OLDPCI
+#error "The sr device requires the old pci compatibility shims"
+#endif
+
 #include "sr.h"
 
 #include <sys/param.h>

sys/pci/adw_pci.c

@@ -31,6 +31,10 @@
  * $FreeBSD$
  */
 
+#ifndef COMPAT_OLDPCI
+#error "The adw device requires the old pci compatibility shims"
+#endif
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>

sys/pci/alpm.c

@@ -27,6 +27,10 @@
  *
  */
 
+#ifndef COMPAT_OLDPCI
+#error "The alpm device requires the old pci compatibility shims"
+#endif
+
 /*
  * Power Management support for the Acer M15x3 chipsets
  */

sys/pci/amd.c

@@ -50,6 +50,10 @@
 /* #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>

sys/pci/cy_pci.c

@@ -33,6 +33,10 @@
 
 #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>

sys/pci/if_ar_p.c

@@ -29,6 +29,10 @@
  * $FreeBSD$
  */
 
+#ifndef COMPAT_OLDPCI
+#error "The ar device requires the old pci compatibility shims"
+#endif
+
 #include "ar.h"
 
 #include <sys/param.h>

sys/pci/if_en_pci.c

@@ -45,6 +45,10 @@
  * 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>

sys/pci/if_lnc_p.c

@@ -20,6 +20,10 @@
  * $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>

sys/pci/if_mn.c

@@ -24,6 +24,10 @@
  * $FreeBSD$
  */
 
+#ifndef COMPAT_OLDPCI
+#error "The mn device requires the old pci compatibility shims"
+#endif
+
 /*
  * Stuff to describe the MUNIC32X and FALC54 chips.
  */

sys/pci/if_sr_p.c

@@ -30,6 +30,10 @@
  * $FreeBSD$
  */
 
+#ifndef COMPAT_OLDPCI
+#error "The sr device requires the old pci compatibility shims"
+#endif
+
 #include "sr.h"
 
 #include <sys/param.h>

sys/pci/meteor.c

@@ -145,6 +145,10 @@
 			future version of this driver.
 */
 
+#ifndef COMPAT_OLDPCI
+#error "The meteor device requires the old pci compatibility shims"
+#endif
+
 #include "meteor.h"
 
 #include "opt_meteor.h"

sys/pci/ncr.c

@@ -39,6 +39,10 @@
 ***************************************************************************
 */
 
+#ifndef COMPAT_OLDPCI
+#error "The ncr device requires the old pci compatibility shims"
+#endif
+
 #define NCR_DATE "pl30 98/1/1"
 
 #define NCR_VERSION	(2)

sys/pci/simos.c

@@ -26,6 +26,10 @@
  * $FreeBSD$
  */
 
+#ifndef COMPAT_OLDPCI
+#error "The simos device requires the old pci compatibility shims"
+#endif
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>