diff options
| author | Dave Jones <davej@redhat.com> | 2005-08-18 01:56:07 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2005-08-18 01:56:07 -0400 |
| commit | a8b3e6f10f08f66ae1072efd087b30966a3654f6 (patch) | |
| tree | 1d1409855f8ad5beabafe061c6453edd84ba94c8 /drivers/char/drm/i830_drv.c | |
| parent | 46acac3b4fd8ef66eec63b51de8d556a17c7d4f7 (diff) | |
| parent | 099d44e869f1886b5eb02a5145ca97b5e4142e28 (diff) | |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/drm/i830_drv.c')
| -rw-r--r-- | drivers/char/drm/i830_drv.c | 2 |
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 @@ | |||
| 40 | 40 | ||
| 41 | #include "drm_pciids.h" | 41 | #include "drm_pciids.h" |
| 42 | 42 | ||
| 43 | int postinit( struct drm_device *dev, unsigned long flags ) | 43 | static int postinit( struct drm_device *dev, unsigned long flags ) |
| 44 | { | 44 | { |
| 45 | dev->counters += 4; | 45 | dev->counters += 4; |
| 46 | dev->types[6] = _DRM_STAT_IRQ; | 46 | dev->types[6] = _DRM_STAT_IRQ; |