diff options
author | Dave Airlie <airlied@starflyer-ubuntu.(none)> | 2006-08-29 00:01:19 +1000 |
---|---|---|
committer | Dave Airlie <airlied@starflyer-ubuntu.(none)> | 2006-08-29 00:01:19 +1000 |
commit | 3cfab681b3c82c7951f1cc337d2021a6f0d08b1e (patch) | |
tree | 4d880f5961a0fe31bddf80391923f117add9e674 /shared-core/via_irq.c | |
parent | 88928380c87e60d22a0a9698c468036f180f0761 (diff) | |
parent | 9b984b34e99f694e10251e15bc2ec1bc844dcca4 (diff) |
Merge branch 'master' into nouveau-1
Diffstat (limited to 'shared-core/via_irq.c')
-rw-r--r-- | shared-core/via_irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shared-core/via_irq.c b/shared-core/via_irq.c index 1862fbcf..db60b28e 100644 --- a/shared-core/via_irq.c +++ b/shared-core/via_irq.c @@ -198,7 +198,7 @@ int via_driver_vblank_wait(drm_device_t * dev, unsigned int *sequence) return ret; } -static int +static int via_driver_irq_wait(drm_device_t * dev, unsigned int irq, int force_sequence, unsigned int *sequence) { |