svn commit: r190131 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb dev/drm

[Robert Noland]

Author: rnoland
Date: Fri Mar 20 05:45:26 2009
New Revision: 190131
URL: http://svn.freebsd.org/changeset/base/190131

Log:
  Merge 189911
  
  We can have more than 3 pci resources

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/drm/drmP.h

Modified: stable/7/sys/dev/drm/drmP.h
==============================================================================
--- stable/7/sys/dev/drm/drmP.h	Fri Mar 20 05:44:31 2009	(r190130)
+++ stable/7/sys/dev/drm/drmP.h	Fri Mar 20 05:45:26 2009	(r190131)
@@ -613,7 +613,7 @@ struct drm_driver_info {
 };
 
 /* Length for the array of resource pointers for drm_get_resource_*. */
-#define DRM_MAX_PCI_RESOURCE	3
+#define DRM_MAX_PCI_RESOURCE	6
 
 /** 
  * DRM device functions structure