diff --git a/sys/arch/alpha/conf/ENIWETOK b/sys/arch/alpha/conf/ENIWETOK index 7ae359cccc95..2161e739a5ea 100644 --- a/sys/arch/alpha/conf/ENIWETOK +++ b/sys/arch/alpha/conf/ENIWETOK @@ -1,4 +1,4 @@ -# $NetBSD: ENIWETOK,v 1.3 1999/02/18 20:18:54 mycroft Exp $ +# $NetBSD: ENIWETOK,v 1.4 1999/02/18 21:27:54 mycroft Exp $ # From: GENERIC,v 1.108 1999/01/06 23:42:27 thorpej Exp # # Mycroft's AS200. @@ -228,7 +228,7 @@ audio* at sb? #uha* at isa? port 0x330 irq ? drq ? # UltraStor [13]4f SCSI (unt.) #uha* at isa? port 0x334 irq ? drq ? # UltraStor [13]4f SCSI (unt.) pcic* at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000 -#pcic* at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000 +pcic* at isapnp? # EISA devices #ahb* at eisa? slot ? # Adaptec 174[024] SCSI (unt.) diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha index 457f97117ffa..ac55d855781b 100644 --- a/sys/arch/alpha/conf/files.alpha +++ b/sys/arch/alpha/conf/files.alpha @@ -1,4 +1,4 @@ -# $NetBSD: files.alpha,v 1.99 1998/11/26 15:35:59 pk Exp $ +# $NetBSD: files.alpha,v 1.100 1999/02/18 21:27:54 mycroft Exp $ # # alpha-specific configuration info @@ -454,15 +454,21 @@ defopt PCIC_ISA_INTR_ALLOC_MASK device pcic: pcmciabus file dev/ic/i82365.c pcic -# PCIC pcmcia contoller +# PCIC pcmcia controller on ISA bus. attach pcic at isa with pcic_isa file dev/isa/i82365_isa.c pcic_isa -file dev/isa/i82365_isasubr.c pcic_isa -# PCIC pcmcia contoller +# PCIC pcmcia controller on PCI bus. attach pcic at pci with pcic_pci file dev/pci/i82365_pci.c pcic_pci +# PCIC pcmcia controller on PnP board +attach pcic at isapnp with pcic_isapnp +file dev/isapnp/i82365_isapnp.c pcic_isapnp + +# Code common to ISA and ISAPnP attachments +file dev/isa/i82365_isasubr.c pcic_isa | pcic_isapnp | pcic_pci + # this wants to be probed as late as possible. #