PERFORCE change 71329 for review

Eric Anholt anholt at FreeBSD.org
Sat Feb 19 12:06:12 PST 2005


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

Change 71329 by anholt at 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"}, \


More information about the p4-projects mailing list