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/i386/conf/ALL,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/i386/conf/ALL,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.201
retrieving revision 1.202
diff -u -p -r1.201 -r1.202
--- src/sys/arch/i386/conf/ALL	2009/07/25 19:04:41	1.201
+++ src/sys/arch/i386/conf/ALL	2009/07/27 12:34:13	1.202
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.201 2009/07/25 19:04:41 cegger Exp $
+# $NetBSD: ALL,v 1.202 2009/07/27 12:34:13 kiyohara Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"ALL-$Revision: 1.201 $"
+#ident 		"ALL-$Revision: 1.202 $"
 
 maxusers	32		# estimated number of users
 
@@ -811,6 +811,7 @@ iteide* 	at pci? dev ? function ?	# IT E
 ixpide* 	at pci? dev ? function ?	# ATI IXP IDE controllers
 jmide* 		at pci? dev ? function ?	# JMicron PCI-e PATA/SATA controllers
 ahcisata* 	at jmide?
+mvsata*		at pci? dev ? function ?	# Marvell Hercules-I/II
 optiide* 	at pci? dev ? function ?	# Opti IDE controllers
 piixide* 	at pci? dev ? function ?	# Intel IDE controllers
 pdcide* 	at pci? dev ? function ?	# Promise IDE controllers