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/conf/files,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/conf/files,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.1051
retrieving revision 1.1052
diff -u -p -r1.1051 -r1.1052
--- src/sys/conf/files	2012/07/02 18:15:46	1.1051
+++ src/sys/conf/files	2012/07/26 20:49:47	1.1052
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1051 2012/07/02 18:15:46 bouyer Exp $
+#	$NetBSD: files,v 1.1052 2012/07/26 20:49:47 jakllsch Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20100430
@@ -290,7 +290,6 @@ define	videobus	{ }
 define	ata	        {[channel = -1]}
 define	sata
 define	sata_fis
-define	sata_pmp
 define	scsi_core
 define	scsi		{[channel = -1]}: scsi_core
 define	ata_hl		{[drive = -1]}
@@ -975,12 +974,12 @@ file	dev/ic/lpt_upc.c		lpt_upc
 # AHCI-compatible SATA controllers
 define ahcisata_core
 file dev/ic/ahcisata_core.c ahcisata_core
-device ahcisata: ata, ata_dma, ata_udma, sata, sata_fis, sata_pmp, ahcisata_core
+device ahcisata: ata, ata_dma, ata_udma, sata, sata_fis, ahcisata_core
 
 # Silicon Image SteelVine SATA-II controllers
 define	siisata
 file	dev/ic/siisata.c		siisata
-device	siisata: ata, ata_dma, ata_udma, sata, sata_fis, sata_pmp, siisata
+device	siisata: ata, ata_dma, ata_udma, sata, sata_fis, siisata
 
 # Marvell Serial-ATA Host Controller
 define mvsata