From db7e7a7213b2d36d034fe1a161a64ef3c5d8948e Mon Sep 17 00:00:00 2001
From: Nate Williams <nate@FreeBSD.org>
Date: Mon, 13 Jan 1997 05:22:40 +0000
Subject: [PATCH] Just 'warn' the user that they are mixing dedicated drivers
 and generic code if the option 'LINT_PCCARD_HACK' is specified (which should
 only be used in LINT).

Demanded by:	bde
---
 sys/i386/isa/if_ze.c | 6 +++++-
 sys/i386/isa/if_zp.c | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/sys/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c
index 5e76af79431..609481efa1e 100644
--- a/sys/i386/isa/if_ze.c
+++ b/sys/i386/isa/if_ze.c
@@ -47,14 +47,18 @@
  */
 
 /*
- * $Id: if_ze.c,v 1.35 1996/12/21 17:53:38 nate Exp $
+ * $Id: if_ze.c,v 1.36 1996/12/23 01:24:44 jkh Exp $
  */
 
 /* XXX - Don't mix different PCCARD support code */
 #include "pcic.h"
 #include "crd.h"
 #if NCRD > 0 || NPCIC > 0
+#ifndef LINT_PCCARD_HACK
 #error "Dedicated PCMCIA drivers and generic PCMCIA support can't be mixed"
+#else
+#warning "Dedicated PCMCIA drivers and generic PCMCIA support can't be mixed"
+#endif
 #endif
 
 #include "ze.h"
diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c
index 63a43ae4390..6c57cf69952 100644
--- a/sys/i386/isa/if_zp.c
+++ b/sys/i386/isa/if_zp.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
- *	$Id: if_zp.c,v 1.29 1996/12/21 17:53:39 nate Exp $
+ *	$Id: if_zp.c,v 1.30 1996/12/23 01:24:44 jkh Exp $
  */
 /*-
  * TODO:
@@ -104,7 +104,11 @@
 #include "pcic.h"
 #include "crd.h"
 #if NCRD > 0 || NPCIC > 0
+#ifndef LINT_PCCARD_HACK
 #error "Dedicated PCMCIA drivers and generic PCMCIA support can't be mixed"
+#else
+#warning "Dedicated PCMCIA drivers and generic PCMCIA support can't be mixed"
+#endif
 #endif
 
 #include "zp.h"