Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/dev/pci/files.pci,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/pci/files.pci,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.236
retrieving revision 1.237
diff -u -p -r1.236 -r1.237
--- src/sys/dev/pci/files.pci	2005/07/11 15:37:04	1.236
+++ src/sys/dev/pci/files.pci	2005/08/29 19:11:33	1.237
@@ -1,4 +1,4 @@
-#	$NetBSD: files.pci,v 1.236 2005/07/11 15:37:04 kiyohara Exp $
+#	$NetBSD: files.pci,v 1.237 2005/08/29 19:11:33 drochner Exp $
 #
 # Config file and device description for machine-independent PCI code.
 # Included by ports that need it.  Requires that the SCSI files be
@@ -198,107 +198,107 @@ file	dev/pci/gtp.c			gtp
 define pciide_common
 file dev/pci/pciide_common.c pciide_common
 
-device	pciide {[channel = -1]}: ata, pciide_common, wdc_common
+device	pciide: ata, pciide_common, wdc_common
 attach	pciide at pci
 file	dev/pci/pciide.c		pciide
 
 # Acard IDE controllers
-device	acardide {[channel = -1]}: ata, pciide_common, wdc_common
+device	acardide: ata, pciide_common, wdc_common
 attach	acardide at pci
 file	dev/pci/acardide.c		acardide
 
 # Acer Lab IDE controllers
-device	aceride {[channel = -1]}: ata, pciide_common, wdc_common
+device	aceride: ata, pciide_common, wdc_common
 attach	aceride at pci
 file	dev/pci/aceride.c		aceride
 
 # Intel i31244 SATA controller
-device	artsata {[channel = -1]}: ata, pciide_common, wdc_common, sata
+device	artsata: ata, pciide_common, wdc_common, sata
 attach	artsata at pci
 file	dev/pci/artsata.c		artsata
 
 # CMD tech IDE controllers
-device	cmdide {[channel = -1]}: ata, pciide_common, wdc_common
+device	cmdide: ata, pciide_common, wdc_common
 attach	cmdide at pci
 file	dev/pci/cmdide.c		cmdide
 
 # Cypress IDE controllers
-device	cypide {[channel = -1]}: ata, pciide_common, wdc_common, cy82c693
+device	cypide: ata, pciide_common, wdc_common, cy82c693
 attach	cypide at pci
 file	dev/pci/cypide.c		cypide
 
 # AMD Geode IDE controllers
-device	geodeide {[channel = -1]}: ata, pciide_common, wdc_common
+device	geodeide: ata, pciide_common, wdc_common
 attach	geodeide at pci
 file	dev/pci/geodeide.c		geodeide
 
 # Triones/HighPoint IDE controllers
-device	hptide {[channel = -1]}: ata, pciide_common, wdc_common
+device	hptide: ata, pciide_common, wdc_common
 attach	hptide at pci
 file	dev/pci/hptide.c		hptide
 
 # Integrated Technology Express IDE controllers
-device	iteide {[channel = -1]}: ata, pciide_common, wdc_common
+device	iteide: ata, pciide_common, wdc_common
 attach	iteide at pci
 file	dev/pci/iteide.c		iteide
 
 # Opti IDE controllers
-device	optiide {[channel = -1]}: ata, pciide_common, wdc_common
+device	optiide: ata, pciide_common, wdc_common
 attach	optiide at pci
 file	dev/pci/optiide.c		optiide
 
 # Intel IDE controllers
-device	piixide {[channel = -1]}: ata, pciide_common, wdc_common
+device	piixide: ata, pciide_common, wdc_common
 attach	piixide at pci
 file	dev/pci/piixide.c		piixide
 
 # Promise Serial ATA controllers
-device	pdcsata {[channel = -1]}: ata, pciide_common, wdc_common
+device	pdcsata: ata, pciide_common, wdc_common
 attach	pdcsata at pci
 file	dev/pci/pdcsata.c		pdcsata
 
 # Promise IDE controllers
-device	pdcide {[channel = -1]}: ata, pciide_common, wdc_common
+device	pdcide: ata, pciide_common, wdc_common
 attach	pdcide at pci
 file	dev/pci/pdcide.c		pdcide
 
 # ServerWorks IDE controllers
-device	rccide {[channel = -1]}: ata, pciide_common, wdc_common
+device	rccide: ata, pciide_common, wdc_common
 attach	rccide at pci
 file	dev/pci/rccide.c		rccide
 
 # Silicon Image SATALink controllers
-device	satalink {[channel = -1]}: ata, pciide_common, wdc_common, sata
+device	satalink: ata, pciide_common, wdc_common, sata
 attach	satalink at pci
 file	dev/pci/satalink.c		satalink
 
 # SiS IDE controllers
-device	siside {[channel = -1]}: ata, pciide_common, wdc_common
+device	siside: ata, pciide_common, wdc_common
 attach	siside at pci
 file	dev/pci/siside.c		siside
 
 # Symphony Labs IDE controllers
-device	slide {[channel = -1]}: ata, pciide_common, wdc_common
+device	slide: ata, pciide_common, wdc_common
 attach	slide at pci
 file	dev/pci/slide.c		slide
 
 # ServerWorks IDE controllers
-#device	swide {[channel = -1]}: ata, pciide_common, wdc_common
+#device	swide: ata, pciide_common, wdc_common
 #attach	swide at pci
 #file	dev/pci/swide.c		swide
 
 # VIA/AMD/Nvidia IDE controllers
-device	viaide {[channel = -1]}: ata, pciide_common, wdc_common
+device	viaide: ata, pciide_common, wdc_common
 attach	viaide at pci
 file	dev/pci/viaide.c	viaide
 
 # STMicroelectronics STPC IDE controllers
-device	stpcide {[channel = -1 ]}: ata, pciide_common, wdc_common
+device	stpcide: ata, pciide_common, wdc_common
 attach	stpcide at pci
 file	dev/pci/stpcide.c	stpcide
 
 # ATI IXP IDE controllers
-device	ixpide {[channel = -1]}: ata, pciide_common, wdc_common
+device	ixpide: ata, pciide_common, wdc_common
 attach	ixpide at pci
 file	dev/pci/ixpide.c	ixpide