diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-28 20:58:09 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-28 20:58:09 -0500 |
| commit | dbc39ec4b69de34e2c2c937131649cc4a104283f (patch) | |
| tree | 23a034fb6994c91289adc830e33ced1d2618d04f /include | |
| parent | 4f427634b127f5fdc4e9fd2e5780f0a6caef936b (diff) | |
| parent | 467a29ea5ad1c1e3b1ffd6aab1166331fcd39361 (diff) | |
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 { | |||
| 1101 | struct platform_device *platformdev; /**< Platform device struture */ | 1101 | struct platform_device *platformdev; /**< Platform device struture */ |
| 1102 | 1102 | ||
| 1103 | struct drm_sg_mem *sg; /**< Scatter gather memory */ | 1103 | struct drm_sg_mem *sg; /**< Scatter gather memory */ |
| 1104 | int num_crtcs; /**< Number of CRTCs on this device */ | 1104 | unsigned int num_crtcs; /**< Number of CRTCs on this device */ |
| 1105 | void *dev_private; /**< device private data */ | 1105 | void *dev_private; /**< device private data */ |
| 1106 | void *mm_private; | 1106 | void *mm_private; |
| 1107 | struct address_space *dev_mapping; | 1107 | struct address_space *dev_mapping; |