diff options
| author | Len Brown <len.brown@intel.com> | 2011-03-18 18:06:08 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-03-18 18:06:08 -0400 |
| commit | 05534c9ffc9d5d950b14de8ba49a7609dc59b0b8 (patch) | |
| tree | 65a01a1e0bc0e28c64fb5105cc763949f5412b4b /drivers/gpu/drm/drm_irq.c | |
| parent | dd87cc53c42f3260b7eb7f60822de0fa9e58af59 (diff) | |
| parent | 589c7a39ae2f2b74fd13ae344ca1dcca61da6bca (diff) | |
Merge branch 'acpica' into release
Diffstat (limited to 'drivers/gpu/drm/drm_irq.c')
| -rw-r--r-- | drivers/gpu/drm/drm_irq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 53120a72a48..28d1d3c24d6 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c | |||
| @@ -1012,7 +1012,8 @@ int drm_modeset_ctl(struct drm_device *dev, void *data, | |||
| 1012 | struct drm_file *file_priv) | 1012 | struct drm_file *file_priv) |
| 1013 | { | 1013 | { |
| 1014 | struct drm_modeset_ctl *modeset = data; | 1014 | struct drm_modeset_ctl *modeset = data; |
| 1015 | int crtc, ret = 0; | 1015 | int ret = 0; |
| 1016 | unsigned int crtc; | ||
| 1016 | 1017 | ||
| 1017 | /* If drm_vblank_init() hasn't been called yet, just no-op */ | 1018 | /* If drm_vblank_init() hasn't been called yet, just no-op */ |
| 1018 | if (!dev->num_crtcs) | 1019 | if (!dev->num_crtcs) |