Merge tag '5.12-rc3-smb3' of git://git.samba.org/sfrench/cifs-2.6

[linux-2.6-microblaze.git] / include / drm / drm_gem_shmem_helper.h

diff --git a/include/drm/drm_gem_shmem_helper.h b/include/drm/drm_gem_shmem_helper.h
index 3449a03..434328d 100644 (file)
--- a/include/drm/drm_gem_shmem_helper.h
+++ b/include/drm/drm_gem_shmem_helper.h
@@ -98,9 +98,9 @@ struct drm_gem_shmem_object {
        unsigned int vmap_use_count;
 
        /**
-        * @map_cached: map object cached (instead of using writecombine).
+        * @map_wc: map object write-combined (instead of using shmem defaults).
         */
-       bool map_cached;
+       bool map_wc;
 };
 
 #define to_drm_gem_shmem_obj(obj) \
@@ -133,9 +133,6 @@ drm_gem_shmem_create_with_handle(struct drm_file *file_priv,
                                 struct drm_device *dev, size_t size,
                                 uint32_t *handle);
 
-struct drm_gem_object *
-drm_gem_shmem_create_object_cached(struct drm_device *dev, size_t size);
-
 int drm_gem_shmem_dumb_create(struct drm_file *file, struct drm_device *dev,
                              struct drm_mode_create_dumb *args);