PERFORCE change 82642 for review

[Eric Anholt]

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

Change 82642 by anholt at anholt_leguin on 2005/08/26 19:15:46

	MF DRI vendor branch 2005-08-26.

Affected files ...

.. //depot/projects/drm-merge/sys/dev/drm/ati_pcigart.c#6 integrate
.. //depot/projects/drm-merge/sys/dev/drm/r300_cmdbuf.c#2 integrate
.. //depot/projects/drm-merge/sys/dev/drm/r300_reg.h#2 integrate

Differences ...

==== //depot/projects/drm-merge/sys/dev/drm/ati_pcigart.c#6 (text+ko) ====

@@ -66,7 +66,7 @@
 
 	bzero(pci_gart, ATI_PCIGART_TABLE_SIZE);
 
-	KASSERT(PAGE_SIZE >= ATI_PCIGART_PAGE_SIZE, "page size too small");
+	KASSERT(PAGE_SIZE >= ATI_PCIGART_PAGE_SIZE, ("page size too small"));
 
 	for ( i = 0 ; i < pages ; i++ ) {
 		page_base = (u32) dev->sg->busaddr[i];

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


==== //depot/projects/drm-merge/sys/dev/drm/r300_reg.h#2 (text+ko) ====