diff options
| author | Michel Daenzer <michel@daenzer.net> | 2003-08-15 10:31:54 +0000 |
|---|---|---|
| committer | Michel Daenzer <michel@daenzer.net> | 2003-08-15 10:31:54 +0000 |
| commit | 9d7b01ebbe71ff6ca3ea421d5bff64f403b592ba (patch) | |
| tree | 8f5d66868305facceb7d0ecdde93c5569c8b5a53 /linux/drm_drv.h | |
| parent | a073ff7dc73dc98e81e2ae26e8c500ea7141084b (diff) | |
Merge from 2.6 kernel (Linus Torvalds)
Diffstat (limited to 'linux/drm_drv.h')
| -rw-r--r-- | linux/drm_drv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drm_drv.h b/linux/drm_drv.h index 5f3eebe3..d62156b3 100644 --- a/linux/drm_drv.h +++ b/linux/drm_drv.h @@ -344,7 +344,6 @@ static int DRM(setup)( drm_device_t *dev ) dev->last_context = 0; dev->last_switch = 0; dev->last_checked = 0; - init_timer( &dev->timer ); init_waitqueue_head( &dev->context_wait ); dev->ctx_start = 0; @@ -624,6 +623,7 @@ static int __init drm_init( void ) dev = &(DRM(device)[i]); memset( (void *)dev, 0, sizeof(*dev) ); dev->count_lock = SPIN_LOCK_UNLOCKED; + init_timer( &dev->timer ); sema_init( &dev->struct_sem, 1 ); if ((DRM(minor)[i] = DRM(stub_register)(DRIVER_NAME, &DRM(fops),dev)) < 0) |