summaryrefslogtreecommitdiffstats
path: root/sys/dev/aic
diff options
context:
space:
mode:
authornyan <nyan@FreeBSD.org>2001-06-26 11:35:46 +0000
committernyan <nyan@FreeBSD.org>2001-06-26 11:35:46 +0000
commit5dec8ab9a60f214b685a1b3cd40587262a683cea (patch)
treed666be9d237a549ae83e465372217f46bca454c0 /sys/dev/aic
parent977c2968e44d25a3732347f152b306b45abc3d5f (diff)
downloadFreeBSD-src-5dec8ab9a60f214b685a1b3cd40587262a683cea.zip
FreeBSD-src-5dec8ab9a60f214b685a1b3cd40587262a683cea.tar.gz
Merged from sys/dev/aic/aic_isa.c revision 1.8.
Diffstat (limited to 'sys/dev/aic')
-rw-r--r--sys/dev/aic/aic_cbus.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/dev/aic/aic_cbus.c b/sys/dev/aic/aic_cbus.c
index 44f958b..c54ac67 100644
--- a/sys/dev/aic/aic_cbus.c
+++ b/sys/dev/aic/aic_cbus.c
@@ -78,12 +78,12 @@ static bus_addr_t aicport_100[AIC_ISA_PORTSIZE] = {
0x20, 0x22, 0x24, 0x26, 0x28, 0x2a, 0x2c, 0x2e,
0x30, 0x32, 0x34, 0x36, 0x38, 0x3a, 0x3c, 0x3e,
};
+#endif
static struct isa_pnp_id aic_ids[] = {
- { 0xa180a3b8, "NEC PC9801-100"},
- {0}
+ { 0xa180a3b8, "NEC PC9801-100" },
+ { 0 }
};
-#endif
static int
aic_isa_alloc_resources(device_t dev)
@@ -169,11 +169,7 @@ aic_isa_probe(device_t dev)
u_int port, *ports;
u_int8_t porta;
-#ifdef PC98
if (ISA_PNP_PROBE(device_get_parent(dev), dev, aic_ids) == ENXIO)
-#else
- if (isa_get_vendorid(dev))
-#endif
return (ENXIO);
port = isa_get_port(dev);
OpenPOWER on IntegriCloud