From cf79681b80f2fe4c1d70f02f3ee1bf07a902698f Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Mon, 18 Apr 2005 12:43:18 +0000
Subject: Fix BUILD_SERIAL.

Change from using #if to #ifdef, since #if can't cope with string
constants.
---
 src/drivers/bus/isa.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'src/drivers/bus')

diff --git a/src/drivers/bus/isa.c b/src/drivers/bus/isa.c
index 99784cc0f..1afb1aa14 100644
--- a/src/drivers/bus/isa.c
+++ b/src/drivers/bus/isa.c
@@ -32,11 +32,21 @@ static char isa_magic[0]; /* guaranteed unique symbol */
  * User-supplied probe address list
  *
  */
-static isa_probe_addr_t isa_extra_probe_addrs[] = {
-	ISA_PROBE_ADDRS
-#if ISA_PROBE_ONLY
-	, 0
+#ifdef ISA_PROBE_ADDRS
+#  ifdef ISA_PROBE_ONLY
+#    define			HAVE_ISA_PROBE_ADDRS	1
+#    define			ISA_PROBE_ADDR_LIST	ISA_PROBE_ADDRS, 0
+#  else
+#    define			HAVE_ISA_PROBE_ADDRS	1
+#    define			ISA_PROBE_ADDR_LIST	ISA_PROBE_ADDRS
+#  endif
+#else
+#  define			HAVE_ISA_PROBE_ADDRS	0
+#  define			ISA_PROBE_ADDR_LIST	
 #endif
+
+static isa_probe_addr_t isa_extra_probe_addrs[] = {
+	ISA_PROBE_ADDR_LIST
 };
 #define isa_extra_probe_addr_count \
      ( sizeof ( isa_extra_probe_addrs ) / sizeof ( isa_extra_probe_addrs[0] ) )
-- 
cgit v1.2.3-55-g7522