Date: Sat, 19 Feb 2005 20:06:11 GMT From: Eric Anholt <anholt@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 71329 for review Message-ID: <200502192006.j1JK6Bcp052922@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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"}, \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200502192006.j1JK6Bcp052922>