Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6

[linux-2.6] / drivers / char / drm / drm_sman.h

diff --git a/drivers/char/drm/drm_sman.h b/drivers/char/drm/drm_sman.h
index 2fef3b2bb61334997e61a8eb5d1d9f007ff1e59a..08ecf83ad5d4ac73f763663eaf7be302b58e0e60 100644 (file)
--- a/drivers/char/drm/drm_sman.h
+++ b/drivers/char/drm/drm_sman.h
@@ -33,7 +33,7 @@
  * struct or a context identifier.
  *
  * Authors:
- * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
+ * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
  */
 
 #ifndef DRM_SMAN_H
@@ -78,7 +78,7 @@ struct drm_sman_mm {
 
 struct drm_memblock_item {
        struct list_head owner_list;
-       drm_hash_item_t user_hash;
+       struct drm_hash_item user_hash;
        void *mm_info;
        struct drm_sman_mm *mm;
        struct drm_sman *sman;
@@ -87,8 +87,8 @@ struct drm_memblock_item {
 struct drm_sman {
        struct drm_sman_mm *mm;
        int num_managers;
-       drm_open_hash_t owner_hash_tab;
-       drm_open_hash_t user_hash_tab;
+       struct drm_open_hash owner_hash_tab;
+       struct drm_open_hash user_hash_tab;
        struct list_head owner_items;
 };