From owner-p4-projects@FreeBSD.ORG  Sat Feb 19 20:06:12 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E88EF16A4D0; Sat, 19 Feb 2005 20:06:11 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A480316A4CE
	for <perforce@freebsd.org>; Sat, 19 Feb 2005 20:06:11 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8981C43D2D
	for <perforce@freebsd.org>; Sat, 19 Feb 2005 20:06:11 +0000 (GMT)
	(envelope-from anholt@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1JK6Bqq052925
	for <perforce@freebsd.org>; Sat, 19 Feb 2005 20:06:11 GMT
	(envelope-from anholt@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1JK6Bcp052922
	for perforce@freebsd.org; Sat, 19 Feb 2005 20:06:11 GMT
	(envelope-from anholt@freebsd.org)
Date: Sat, 19 Feb 2005 20:06:11 GMT
Message-Id: <200502192006.j1JK6Bcp052922@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	anholt@freebsd.org using -f
From: Eric Anholt <anholt@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 71329 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Feb 2005 20:06:12 -0000

http://perforce.freebsd.org/chv.cgi?CH=71329

Change 71329 by anholt@anholt_leguin on 2005/02/19 20:05:56

	Re-merge DRI CVS after adding a merge of mux's drm_drv.h r1.26, and a
	cvsup that included a couple of little PCI ID changes.

Affected files ...

.. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_drv.c#2 edit
.. //depot/projects/drm-merge-vendor/sys/dev/drm/drm_pciids.h#3 edit

Differences ...

==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_drv.c#2 (text+ko) ====

@@ -45,6 +45,9 @@
 MODULE_VERSION(drm, 1);
 MODULE_DEPEND(drm, agp, 1, 1, 1);
 MODULE_DEPEND(drm, pci, 1, 1, 1);
+#if __FreeBSD_version > 502127
+MODULE_DEPEND(drm, mem, 1, 1, 1);
+#endif
 #endif /* __FreeBSD__ */
 
 #if defined(__NetBSD__) || defined(__OpenBSD__)

==== //depot/projects/drm-merge-vendor/sys/dev/drm/drm_pciids.h#3 (text+ko) ====

@@ -65,7 +65,7 @@
 	{0x1002, 0x5963, CHIP_RV280, "ATI Radeon RV280 9200"}, \
 	{0x1002, 0x5964, CHIP_RV280, "ATI Radeon RV280 9200 SE"}, \
 	{0x1002, 0x5968, CHIP_RV280, "ATI Radeon RV280 9200"}, \
-	{0x1002, 0x5969, CHIP_RV280, "ATI Radeon RV280 9200"}, \
+	{0x1002, 0x5969, CHIP_RV100, "ATI ES1000 RN50"}, \
 	{0x1002, 0x596A, CHIP_RV280, "ATI Radeon RV280 9200"}, \
 	{0x1002, 0x596B, CHIP_RV280, "ATI Radeon RV280 9200"}, \
 	{0x1002, 0x5c61, CHIP_RV280|CHIP_IS_MOBILITY, "ATI Radeon RV280 Mobility"}, \