diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-02-20 11:55:12 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-02-20 11:55:12 +0100 |
| commit | bf5f48339a019c9b4b42284c3f45d58942cbda27 (patch) | |
| tree | 79976135166ffbdaf4ccb91bcadb17ddb551f060 /drivers/gpu/drm/r128/r128_irq.c | |
| parent | d85dad75566674ca8012715ac00a84ced3697972 (diff) | |
| parent | 35582ad9d342025653aaf28ed321bf5352488d7f (diff) | |
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
Diffstat (limited to 'drivers/gpu/drm/r128/r128_irq.c')
| -rw-r--r-- | drivers/gpu/drm/r128/r128_irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c index 2ea4f09d269..c2ae496babb 100644 --- a/drivers/gpu/drm/r128/r128_irq.c +++ b/drivers/gpu/drm/r128/r128_irq.c @@ -44,7 +44,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc) return atomic_read(&dev_priv->vbl_received); } -irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS) +irqreturn_t r128_driver_irq_handler(int irq, void *arg) { struct drm_device *dev = (struct drm_device *) arg; drm_r128_private_t *dev_priv = (drm_r128_private_t *) dev->dev_private; |