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.

2 files changed, 11 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;