Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / drivers / char / drm / drm_drv.h

diff --git a/drivers/char/drm/drm_drv.h b/drivers/char/drm/drm_drv.h
index 4e67b7b..cf4f37c 100644 (file)
--- a/drivers/char/drm/drm_drv.h
+++ b/drivers/char/drm/drm_drv.h
@@ -532,7 +532,7 @@ static int DRM(takedown)( drm_device_t *dev )
 #endif
        if ( dev->lock.hw_lock ) {
                dev->sigdata.lock = dev->lock.hw_lock = NULL; /* SHM removed */
-               dev->lock.filp = 0;
+               dev->lock.filp = NULL;
                wake_up_interruptible( &dev->lock.lock_queue );
        }
        up( &dev->struct_sem );