diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-01-25 15:27:53 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-01-25 15:27:53 +1000 |
| commit | e7a41d7f5be49241480a20eb733262712e0f8dcb (patch) | |
| tree | 801c7eadf769db981dfb8a900a24ef48542958a6 /shared-core/nouveau_drv.h | |
| parent | fb9ea12438de95a6ac085879e079055eaea3daf8 (diff) | |
| parent | bfdddd218ec3e7ce3f8e765b93af35661a7bf0fd (diff) | |
Merge remote branch 'origin/master' into modesetting-101
Conflicts:
linux-core/drm_bo.c
linux-core/drm_drv.c
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
shared-core/radeon_irq.c
Diffstat (limited to 'shared-core/nouveau_drv.h')
| -rw-r--r-- | shared-core/nouveau_drv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shared-core/nouveau_drv.h b/shared-core/nouveau_drv.h index 85a0d0b5..4184aa5b 100644 --- a/shared-core/nouveau_drv.h +++ b/shared-core/nouveau_drv.h @@ -432,7 +432,7 @@ extern int nouveau_ioctl_gpuobj_free(struct drm_device *, void *data, /* nouveau_irq.c */ extern irqreturn_t nouveau_irq_handler(DRM_IRQ_ARGS); extern void nouveau_irq_preinstall(struct drm_device *); -extern void nouveau_irq_postinstall(struct drm_device *); +extern int nouveau_irq_postinstall(struct drm_device *); extern void nouveau_irq_uninstall(struct drm_device *); /* nouveau_sgdma.c */ |