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/i915_drv.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/i915_drv.c')
| -rw-r--r-- | drivers/char/drm/i915_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/i915_drv.c b/drivers/char/drm/i915_drv.c index 6a6cc3c0c4c3..1f59d3fc79bc 100644 --- a/drivers/char/drm/i915_drv.c +++ b/drivers/char/drm/i915_drv.c | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | 34 | ||
| 35 | #include "drm_pciids.h" | 35 | #include "drm_pciids.h" |
| 36 | 36 | ||
| 37 | int postinit( struct drm_device *dev, unsigned long flags ) | 37 | static int postinit( struct drm_device *dev, unsigned long flags ) |
| 38 | { | 38 | { |
| 39 | dev->counters += 4; | 39 | dev->counters += 4; |
| 40 | dev->types[6] = _DRM_STAT_IRQ; | 40 | dev->types[6] = _DRM_STAT_IRQ; |