summaryrefslogtreecommitdiffstats
path: root/sys/i386/isa/if_zp.c
diff options
context:
space:
mode:
authornate <nate@FreeBSD.org>1996-12-21 17:53:39 +0000
committernate <nate@FreeBSD.org>1996-12-21 17:53:39 +0000
commit249fc1b48c9b7b830ebbf08049d4b97f9691f935 (patch)
tree4a3013752358de45dec618d0acbf0aaf41156ffe /sys/i386/isa/if_zp.c
parent2e06aeb9e246655bf82511e9f876083301876f7c (diff)
downloadFreeBSD-src-249fc1b48c9b7b830ebbf08049d4b97f9691f935.zip
FreeBSD-src-249fc1b48c9b7b830ebbf08049d4b97f9691f935.tar.gz
PCCARD support safety belts.
Don't allow people to use the 'dedicated' drivers at the same time as the generic support code, as it can cause all sorts of problems including kernel crashes. [ definite 2.2 material ]
Diffstat (limited to 'sys/i386/isa/if_zp.c')
-rw-r--r--sys/i386/isa/if_zp.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c
index d76bd88..d649bcc 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.27 1996/11/11 17:11:08 bde Exp $
+ * $Id: if_zp.c,v 1.28 1996/12/13 21:28:25 wollman Exp $
*/
/*-
* TODO:
@@ -100,6 +100,13 @@
* ETO, Toshihisa <eto@osl.fujitsu.co.jp>
*/
+/* XXX - Don't mix different PCCARD support code */
+#include "pcic.h"
+#include "crd.h"
+#if NCRD > 0 || NPCIC > 0
+#error Dedicated PCMCIA drivers and generic PCMCIA support can't be mixed
+#endif
+
#include "zp.h"
#include "bpfilter.h"
OpenPOWER on IntegriCloud