diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-18 13:51:42 +1100 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-02-18 13:51:42 +1100 |
| commit | c58310bf4933986513020fa90b4190c7492995ae (patch) | |
| tree | 143f2c7578d02ebef5db8fc57ae69e951ae0e2ee /drivers/char/drm/i830_irq.c | |
| parent | 269cdfaf769f5cd831284cc831790c7c5038040f (diff) | |
| parent | 1309d4e68497184d2fd87e892ddf14076c2bda98 (diff) | |
| download | talos-op-linux-c58310bf4933986513020fa90b4190c7492995ae.tar.gz talos-op-linux-c58310bf4933986513020fa90b4190c7492995ae.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/char/drm/i830_irq.c')
| -rw-r--r-- | drivers/char/drm/i830_irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/i830_irq.c b/drivers/char/drm/i830_irq.c index 76403f4b6200..a33db5f0967f 100644 --- a/drivers/char/drm/i830_irq.c +++ b/drivers/char/drm/i830_irq.c @@ -144,7 +144,7 @@ int i830_irq_wait(struct drm_device *dev, void *data, struct drm_file *file_priv) { drm_i830_private_t *dev_priv = dev->dev_private; - drm_i830_irq_wait_t *irqwait = data; + drm_i830_irq_wait_t *irqwait = data; if (!dev_priv) { DRM_ERROR("%s called with no initialization\n", __FUNCTION__); |
