diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-09 12:59:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-09 12:59:23 -0400 |
| commit | 0109fd37046de64e8459f8c4f4706df9ac7cc82c (patch) | |
| tree | 18dcdb43cc8c6cd494375f8af919024889d24d87 /drivers/char/drm/drm_irq.c | |
| parent | cc14cf46da215a9df1c0a4388763a68769ef9e53 (diff) | |
| parent | 850eb83a6a21b086624b227653ce90ad927ba423 (diff) | |
Merge head 'drm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
Diffstat (limited to 'drivers/char/drm/drm_irq.c')
| -rw-r--r-- | drivers/char/drm/drm_irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/drm_irq.c b/drivers/char/drm/drm_irq.c index 2e236ebcf27b..cdd4aecd25e2 100644 --- a/drivers/char/drm/drm_irq.c +++ b/drivers/char/drm/drm_irq.c | |||
| @@ -89,7 +89,7 @@ int drm_irq_by_busid(struct inode *inode, struct file *filp, | |||
| 89 | * \c drm_driver_irq_preinstall() and \c drm_driver_irq_postinstall() functions | 89 | * \c drm_driver_irq_preinstall() and \c drm_driver_irq_postinstall() functions |
| 90 | * before and after the installation. | 90 | * before and after the installation. |
| 91 | */ | 91 | */ |
| 92 | int drm_irq_install( drm_device_t *dev ) | 92 | static int drm_irq_install( drm_device_t *dev ) |
| 93 | { | 93 | { |
| 94 | int ret; | 94 | int ret; |
| 95 | unsigned long sh_flags=0; | 95 | unsigned long sh_flags=0; |