Module Name:	src
Committed By:	bouyer
Date:		Mon Oct 12 16:09:25 UTC 1998

Modified Files:
	src/sys/arch/arm32/mainbus: wdc_pioc.c
	src/sys/arch/arm32/podulebus: icside.c rapide.c simide.c
	src/sys/arch/atari/dev: wdc_mb.c
	src/sys/arch/i386/conf: GENERIC files.i386
	src/sys/conf: files
	src/sys/dev/ata: files.ata wd.c
	src/sys/dev/ic: wdc.c wdcreg.h wdcvar.h
	src/sys/dev/isa: files.isa wdc_isa.c
	src/sys/dev/isapnp: wdc_isapnp.c
	src/sys/dev/ofisa: wdc_ofisa.c
	src/sys/dev/pci: files.pci pciide.c pciidereg.h pciidevar.h
	src/sys/dev/pcmcia: wdc_pcmcia.c
	src/sys/dev/scsipi: atapi_base.c atapiconf.c atapiconf.h files.scsipi
	    scsipiconf.h
Added Files:
	src/sys/dev/ata: ata.c ata_wdc.c atareg.h atavar.h wdvar.h
	src/sys/dev/pci: pciide_apollo_reg.h pciide_cmd_reg.h pciide_piix_reg.h
	src/sys/dev/scsipi: atapi_wdc.c
Removed Files:
	src/sys/dev/ata: wdlink.h
Log Message:
Merge bouyer-ide