3 files changed, 10 insertions, 9 deletions

diff --git a/linux-core/drmP.h b/linux-core/drmP.h
index c3607c3f..0bf71c49 100644
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@ -592,7 +592,7 @@ typedef struct ati_pcigart_info {
 } drm_ati_pcigart_info;
 
 
-#include "drm_ttm.h"
+#include "drm_objects.h"
 
 /**
  * DRM driver structure. This structure represent the common code for
diff --git a/linux-core/drm_fence.c b/linux-core/drm_fence.c
index dc428949..3ccfdcb8 100644
--- a/linux-core/drm_fence.c
+++ b/linux-core/drm_fence.c
@@ -147,7 +147,7 @@ static void drm_fence_object_destroy(drm_file_t * priv,
 	drm_fence_usage_deref_locked(dev, fence);
 }
 
-static int fence_signaled(drm_device_t * dev, volatile
+static int fence_signaled(drm_device_t * dev,
 			  drm_fence_object_t * fence,
 			  uint32_t mask, int poke_flush)
 {
@@ -172,7 +172,7 @@ static void drm_fence_flush_exe(drm_fence_manager_t * fm,
 	uint32_t diff;
 
 	if (!fm->pending_exe_flush) {
-		volatile struct list_head *list;
+		struct list_head *list;
 
 		/*
 		 * Last_exe_flush is invalid. Find oldest sequence.
@@ -201,14 +201,15 @@ static void drm_fence_flush_exe(drm_fence_manager_t * fm,
 	}
 }
 
-int drm_fence_object_signaled(volatile drm_fence_object_t * fence,
+int drm_fence_object_signaled(drm_fence_object_t * fence,
 			      uint32_t type)
 {
 	return ((fence->signaled & type) == type);
 }
 
 int drm_fence_object_flush(drm_device_t * dev,
-			   volatile drm_fence_object_t * fence, uint32_t type)
+			   drm_fence_object_t * fence,
+			   uint32_t type)
 {
 	drm_fence_manager_t *fm = &dev->fm;
 	drm_fence_driver_t *driver = dev->driver->fence_driver;
@@ -274,7 +275,7 @@ void drm_fence_flush_old(drm_device_t * dev, uint32_t sequence)
 EXPORT_SYMBOL(drm_fence_flush_old);
 
 static int drm_fence_lazy_wait(drm_device_t *dev,
-			       volatile drm_fence_object_t *fence,
+			       drm_fence_object_t *fence,
 			       int ignore_signals, uint32_t mask)
 {
 	drm_fence_manager_t *fm = &dev->fm;
@@ -301,7 +302,7 @@ static int drm_fence_lazy_wait(drm_device_t *dev,
 }
 
 int drm_fence_object_wait(drm_device_t * dev,
-			  volatile drm_fence_object_t * fence,
+			  drm_fence_object_t * fence,
 			  int lazy, int ignore_signals, uint32_t mask)
 {
 	drm_fence_driver_t *driver = dev->driver->fence_driver;
diff --git a/linux-core/drm_ttm.h b/linux-core/drm_objects.h
index 04fb1707..f9b8ebd9 100644
--- a/linux-core/drm_ttm.h
+++ b/linux-core/drm_objects.h
@@ -28,8 +28,8 @@
  * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com>
  */
 
-#ifndef _DRM_TTM_H
-#define _DRM_TTM_H
+#ifndef _DRM_OBJECTS_H
+#define _DRM_OJBECTS_H
 #define DRM_HAS_TTM
 
 struct drm_device;