diff options
| author | nate <nate@FreeBSD.org> | 1997-01-13 05:22:40 +0000 |
|---|---|---|
| committer | nate <nate@FreeBSD.org> | 1997-01-13 05:22:40 +0000 |
| commit | 1893017e4eba5cde23043b2d1a57ce02dc7a00e5 (patch) | |
| tree | 15e9d977b3811e60f3a673c93e3f82500c0efce3 /sys/i386 | |
| parent | 2448afb887b0366987b8b7408169c75a4e4b6c75 (diff) | |
| download | FreeBSD-src-1893017e4eba5cde23043b2d1a57ce02dc7a00e5.zip FreeBSD-src-1893017e4eba5cde23043b2d1a57ce02dc7a00e5.tar.gz | |
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
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/isa/if_ze.c | 6 | ||||
| -rw-r--r-- | 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 5e76af7..609481e 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 63a43ae..6c57cf6 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" |
