summaryrefslogtreecommitdiff
path: root/include/drm
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-03-01 23:20:20 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2011-03-01 23:20:20 +0000
commit8d3c3ddfa85837e24fad6fa39318617cbb59e843 (patch)
treef699dcaac2a11f0c9506ad111ae39fd5e3617c2d /include/drm
parente8b2c3c47a53348aebbbeb5322e32937df958793 (diff)
parent6927faf30920b8c03dfa007e732642a1f1f20089 (diff)
downloadlinux-3.10-8d3c3ddfa85837e24fad6fa39318617cbb59e843.tar.gz
linux-3.10-8d3c3ddfa85837e24fad6fa39318617cbb59e843.tar.bz2
linux-3.10-8d3c3ddfa85837e24fad6fa39318617cbb59e843.zip
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/drmP.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index fe29aadb129..348843b8015 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -1101,7 +1101,7 @@ struct drm_device {
struct platform_device *platformdev; /**< Platform device struture */
struct drm_sg_mem *sg; /**< Scatter gather memory */
- int num_crtcs; /**< Number of CRTCs on this device */
+ unsigned int num_crtcs; /**< Number of CRTCs on this device */
void *dev_private; /**< device private data */
void *mm_private;
struct address_space *dev_mapping;