diff options
| author | Eric Anholt <eric@anholt.net> | 2008-05-30 14:42:08 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-05-30 14:42:08 -0700 |
| commit | 461bfa3da6f85b85c21cd84f81bb4eefa5481418 (patch) | |
| tree | 33e91c8cd024f67922670f9ed6565ceda1e4f3b5 /linux-core/drm_irq.c | |
| parent | 50bce2bc625deb439dd61f504496dddd0cd4f572 (diff) | |
| parent | 6e8a2cff66ac0d6afaf9bb233bc81449c2014078 (diff) | |
Merge commit 'origin/master' into drm-gem
Conflicts:
linux-core/Makefile.kernel
shared-core/i915_drv.h
shared-core/nouveau_state.c
Diffstat (limited to 'linux-core/drm_irq.c')
| -rw-r--r-- | linux-core/drm_irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/drm_irq.c b/linux-core/drm_irq.c index 592ea2ad..8f27d7f3 100644 --- a/linux-core/drm_irq.c +++ b/linux-core/drm_irq.c @@ -437,7 +437,7 @@ int drm_modeset_ctl(struct drm_device *dev, void *data, int crtc, ret = 0; u32 new; - crtc = modeset->arg; + crtc = modeset->crtc; if (crtc >= dev->num_crtcs) { ret = -EINVAL; goto out; |