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/arch/amd64/conf/GENERIC,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/amd64/conf/GENERIC,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- src/sys/arch/amd64/conf/GENERIC	2003/10/23 01:14:43	1.14
+++ src/sys/arch/amd64/conf/GENERIC	2003/10/25 20:26:54	1.15
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.14 2003/10/23 01:14:43 fvdl Exp $
+# $NetBSD: GENERIC,v 1.15 2003/10/25 20:26:54 fvdl Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.14 $"
+#ident 		"GENERIC-$Revision: 1.15 $"
 
 maxusers	32		# estimated number of users
 
@@ -337,6 +337,7 @@ ld*	at iop? tid ?			# block devices
 adv*	at pci? dev ? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
 adw*	at pci? dev ? function ?	# AdvanSys 9x0UW[D], 3940U[2,3]W SCSI
 ahc*	at pci? dev ? function ?	# Adaptec [23]94x, aic78x0 SCSI
+ahd*	at pci? dev ? function ?	# Adaptec aic790x SCSI
 bha*	at pci? dev ? function ?	# BusLogic 9xx SCSI
 dpt*	at pci? dev ? function ?	# DPT SmartCache/SmartRAID
 iha*	at pci? dev ? function ?	# Initio INIC-940/950 SCSI
@@ -431,6 +432,10 @@ wd*	at atabus? drive ? flags 0x0000
 # ATAPI bus support
 atapibus* at atapi?
 
+# ATA RAID configuration support, as found on some Promise controllers.  
+pseudo-device ataraid  
+ld*     at ataraid? vendtype ? unit ?
+
 # ATAPI devices
 # flags have the same meaning as for IDE drives.
 cd*	at atapibus? drive ? flags 0x0000	# ATAPI CD-ROM drives
@@ -453,6 +458,7 @@ fd*	at fdc? drive ?			# the drives thems
 # PCI network interfaces
 an*	at pci? dev ? function ?	# Aironet PC4500/PC4800 (802.11)
 bge* 	at pci? dev ? function ?	# Broadcom 570x gigabit Ethernet
+bce* 	at pci? dev ? function ?	# Broadcom 440x 10/100 Etherner
 en*	at pci? dev ? function ?	# ENI/Adaptec ATM
 ep*	at pci? dev ? function ?	# 3Com 3c59x
 epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet