Minor tweaks to get these to stop breaking LINT. They still dont work

and emit warnings, but we need to get the test coverage elsewhere.

6 files changed, 31 insertions, 0 deletions

diff --git a/sys/dev/hea/eni.c b/sys/dev/hea/eni.c
index ae0da84..8a938df 100644
--- a/sys/dev/hea/eni.c
+++ b/sys/dev/hea/eni.c
@@ -35,6 +35,10 @@
  *
  */
 
+#ifdef COMPILING_LINT
+#warning "The eni driver is broken and is not compiled with LINT"
+#else
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -62,6 +66,10 @@
 __RCSID("@(#) $FreeBSD$");
 #endif
 
+#ifndef COMPAT_OLDPCI
+#error "The eni device requires the old pci compatibility shims"
+#endif
+
 /*
  * Typedef local functions
  */
@@ -678,3 +686,4 @@ eni_pci_shutdown ( eup, howto )
 
 }
 #endif	/* BSD < 199506 */
+#endif
diff --git a/sys/dev/hea/eni.h b/sys/dev/hea/eni.h
index e44a2a9..76b4c9c 100644
--- a/sys/dev/hea/eni.h
+++ b/sys/dev/hea/eni.h
@@ -442,7 +442,9 @@ struct mbd {
  */
 struct eni_unit {
 	Cmn_unit	eu_cmn;		/* Common unit stuff */
+#ifdef COMPAT_OLDPCI
 	pcici_t		eu_pcitag;	/* PCI tag */
+#endif
 	Eni_mem 	eu_base;	/* Adapter memory base */
 	Eni_mem 	eu_ram;		/* Adapter RAM */
 	u_long		eu_ramsize;
diff --git a/sys/dev/hfa/fore_load.c b/sys/dev/hfa/fore_load.c
index be58689..d7d7def 100644
--- a/sys/dev/hfa/fore_load.c
+++ b/sys/dev/hfa/fore_load.c
@@ -27,6 +27,10 @@
  *
  */
 
+#ifdef COMPILING_LINT 
+#warning "The fore pci driver is broken and is not compiled with LINT"
+#else 
+
 /*
  * FORE Systems 200-Series Adapter Support
  * ---------------------------------------
@@ -77,6 +81,9 @@ static void	fore_pci_shutdown __P((void *, int));
 static void	fore_unattach __P((Fore_unit *));
 static void	fore_reset __P((Fore_unit *));
 
+#ifndef COMPAT_OLDPCI
+#error "The fore device requires the old pci compatibility shims"
+#endif
 
 /*
  * Local variables
@@ -632,3 +639,4 @@ fore_mod(lkmtp, cmd, ver)
 
 #endif	/* ATM_LINKED */
 
+#endif
diff --git a/sys/dev/hfa/fore_var.h b/sys/dev/hfa/fore_var.h
index 5f844e8..4c0d6c2 100644
--- a/sys/dev/hfa/fore_var.h
+++ b/sys/dev/hfa/fore_var.h
@@ -166,7 +166,9 @@ struct fore_unit {
 	Fore_reg	*fu_ctlreg;	/* Device control register */
 	Fore_reg	*fu_imask;	/* Interrupt mask register */
 	Fore_reg	*fu_psr;	/* PCI specific register */
+#ifdef COMPAT_OLDPCI
 	pcici_t		fu_pcitag;	/* PCI tag */
+#endif
 	Fore_mem	*fu_ram;	/* Device RAM */
 	u_int		fu_ramsize;	/* Size of device RAM */
 	Mon960		*fu_mon;	/* Monitor program interface */
diff --git a/sys/dev/lmc/if_lmc.c b/sys/dev/lmc/if_lmc.c
index a04ef28..2e13f16 100644
--- a/sys/dev/lmc/if_lmc.c
+++ b/sys/dev/lmc/if_lmc.c
@@ -28,6 +28,10 @@
  *	$Id: if_lmc.c,v 1.9 1999/02/19 15:08:42 explorer Exp $
  */
 
+#ifdef COMPILING_LINT
+#warning "The lmc driver is broken and is not compiled with LINT"
+#else
+
 char lmc_version[] = "BSD 1.1";
 
 #include "opt_netgraph.h"
@@ -1555,3 +1559,5 @@ ng_lmc_init(void *ignored)
 
 
 #include "dev/lmc/if_lmc_fbsd3.c"
+
+#endif
diff --git a/sys/dev/lmc/if_lmc_fbsd3.c b/sys/dev/lmc/if_lmc_fbsd3.c
index f6f9bf9..74d2226 100644
--- a/sys/dev/lmc/if_lmc_fbsd3.c
+++ b/sys/dev/lmc/if_lmc_fbsd3.c
@@ -36,6 +36,10 @@
 #define	PCI_GETBUSDEVINFO(sc) (sc)->lmc_pci_busno = (config_id->bus), \
 			      (sc)->lmc_pci_devno = (config_id->slot) 
 
+#ifndef COMPAT_OLDPCI
+#error "The lmc device requires the old pci compatibility shims"
+#endif
+
 #if 0
 static void lmc_shutdown(int howto, void * arg);
 #endif