summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2001-01-29 09:38:39 +0000
committerpeter <peter@FreeBSD.org>2001-01-29 09:38:39 +0000
commitb7edc4f4e3e8a67e435d794319102a67c59af546 (patch)
tree1281145cc84b32bb59314a3b88e848f48901c103 /sys/dev
parent2c6ef92d83b54b2a2a2203ee3860bc46a6c56341 (diff)
downloadFreeBSD-src-b7edc4f4e3e8a67e435d794319102a67c59af546.zip
FreeBSD-src-b7edc4f4e3e8a67e435d794319102a67c59af546.tar.gz
Send "#if NISA > 0" to the bit-bucket and replace it with an option.
These were compile-time "is the isa code present?" tests and not 'how many isa busses' tests.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ata/ata-all.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index 9dec51c..17f1de9 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -29,7 +29,6 @@
*/
#include "ata.h"
-#include "isa.h"
#include "card.h"
#include "pci.h"
#include "atadisk.h"
@@ -37,6 +36,7 @@
#include "atapifd.h"
#include "atapist.h"
#include "opt_global.h"
+#include "opt_isa.h"
#include "opt_ata.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -98,7 +98,7 @@ static struct intr_config_hook *ata_delayed_attach = NULL;
static char ata_conf[256];
static MALLOC_DEFINE(M_ATA, "ATA generic", "ATA driver generic layer");
-#if NISA > 0
+#ifdef DEV_ISA
static struct isa_pnp_id ata_ids[] = {
{0x0006d041, "Generic ESDI/IDE/ATA controller"}, /* PNP0600 */
{0x0106d041, "Plus Hardcard II"}, /* PNP0601 */
OpenPOWER on IntegriCloud