summaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/i830_drv.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-07-14 01:11:44 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-07-14 01:11:44 +0200
commit08cd84c81f27d5bd22ba958b7cae6d566c509280 (patch)
tree6fdb546c151410851fd3c604d42590afa4215084 /drivers/char/drm/i830_drv.c
parentMerge /spare/repo/netdev-2.6 branch 'ieee80211' (diff)
parentMerge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6. (diff)
downloadlinux-08cd84c81f27d5bd22ba958b7cae6d566c509280.tar.xz
linux-08cd84c81f27d5bd22ba958b7cae6d566c509280.zip
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'drivers/char/drm/i830_drv.c')
-rw-r--r--drivers/char/drm/i830_drv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/i830_drv.c b/drivers/char/drm/i830_drv.c
index aa80ad6a5ee0..bc36be76b8b2 100644
--- a/drivers/char/drm/i830_drv.c
+++ b/drivers/char/drm/i830_drv.c
@@ -40,7 +40,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;