aboutsummaryrefslogtreecommitdiff
path: root/sys/i386/isa/if_zp.c
diff options
context:
space:
mode:
authorNate Williams <nate@FreeBSD.org>1997-01-13 05:22:40 +0000
committerNate Williams <nate@FreeBSD.org>1997-01-13 05:22:40 +0000
commitdb7e7a7213b2d36d034fe1a161a64ef3c5d8948e (patch)
tree15e9d977b3811e60f3a673c93e3f82500c0efce3 /sys/i386/isa/if_zp.c
parentec0ae37d1053072fb3353cf96bd102b19377ac44 (diff)
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
Notes
Notes: svn path=/head/; revision=21645
Diffstat (limited to 'sys/i386/isa/if_zp.c')
-rw-r--r--sys/i386/isa/if_zp.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c
index 63a43ae4390b..6c57cf69952f 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"