From 553435cfa7fa244d36cd1369acd19b8114d5abf2 Mon Sep 17 00:00:00 2001
From: "Jordan K. Hubbard" <jkh@FreeBSD.org>
Date: Mon, 23 Dec 1996 01:24:44 +0000
Subject: [PATCH] Someone needs to teach Nate about the C pre-processor in
 general and the workings of #error in particular.  He also broke the 2.2
 build with this change, leading me to wonder whether or not the changes were
 ever even tested.  Folks, I'm happy to see people work directly on 2.2 like
 this and will continue to encourage Nate to make direct commits, but please
 TEST before committing!  I think that's a more than reasonable prerequisite,
 and this code could never have worked at all, leading me to believe that Nate
 skipped this most basic of steps.

---
 sys/i386/isa/if_ze.c | 4 ++--
 sys/i386/isa/if_zp.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c
index 9f9951c8ffa..5e76af79431 100644
--- a/sys/i386/isa/if_ze.c
+++ b/sys/i386/isa/if_ze.c
@@ -47,14 +47,14 @@
  */
 
 /*
- * $Id: if_ze.c,v 1.34 1996/12/13 21:28:24 wollman Exp $
+ * $Id: if_ze.c,v 1.35 1996/12/21 17:53:38 nate Exp $
  */
 
 /* 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
+#error "Dedicated PCMCIA drivers and generic PCMCIA support can't be mixed"
 #endif
 
 #include "ze.h"
diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c
index d649bccb309..63a43ae4390 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.28 1996/12/13 21:28:25 wollman Exp $
+ *	$Id: if_zp.c,v 1.29 1996/12/21 17:53:39 nate Exp $
  */
 /*-
  * TODO:
@@ -104,7 +104,7 @@
 #include "pcic.h"
 #include "crd.h"
 #if NCRD > 0 || NPCIC > 0
-#error Dedicated PCMCIA drivers and generic PCMCIA support can't be mixed
+#error "Dedicated PCMCIA drivers and generic PCMCIA support can't be mixed"
 #endif
 
 #include "zp.h"