summaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/i915_drv.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-09 18:59:23 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-09 18:59:23 +0200
commit0109fd37046de64e8459f8c4f4706df9ac7cc82c (patch)
tree18dcdb43cc8c6cd494375f8af919024889d24d87 /drivers/char/drm/i915_drv.c
parentMerge head 'drm-3264' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/... (diff)
parentdrm: wrap config.h include in a ifdef KERNEL (diff)
downloadlinux-0109fd37046de64e8459f8c4f4706df9ac7cc82c.tar.xz
linux-0109fd37046de64e8459f8c4f4706df9ac7cc82c.zip
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.c2
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 @@
#include "drm_pciids.h"
-int postinit( struct drm_device *dev, unsigned long flags )
+static int postinit( struct drm_device *dev, unsigned long flags )
{
dev->counters += 4;
dev->types[6] = _DRM_STAT_IRQ;