diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-01 02:58:09 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-01 02:58:09 +0100 |
| commit | dbc39ec4b69de34e2c2c937131649cc4a104283f (patch) | |
| tree | 23a034fb6994c91289adc830e33ced1d2618d04f /include | |
| parent | Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | Merge remote branch 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next ... (diff) | |
| download | linux-dbc39ec4b69de34e2c2c937131649cc4a104283f.tar.xz linux-dbc39ec4b69de34e2c2c937131649cc4a104283f.zip | |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: fix unsigned vs signed comparison issue in modeset ctl ioctl.
drm/nv50-nvc0: make sure vma is definitely unmapped when destroying bo
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/drmP.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index fe29aadb129d..348843b80150 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; |