1 files changed, 10 insertions, 18 deletions

diff --git a/drivers/gpu/pvr/private_data.h b/drivers/gpu/pvr/private_data.h
index df9f6ade53a..0c55499220a 100644
--- a/drivers/gpu/pvr/private_data.h
+++ b/drivers/gpu/pvr/private_data.h
@@ -32,35 +32,23 @@
 #include <drm/drmP.h>
 #endif
 
-#if defined(SUPPORT_DRI_DRM) && defined(PVR_LINUX_USING_WORKQUEUES)
-#include <linux/workqueue.h>
-#endif
-
 typedef struct
 {
         
         IMG_UINT32 ui32OpenPID;
 
-#if defined(PVR_SECURE_FD_EXPORT)
         
+#if defined (SUPPORT_SID_INTERFACE)
+        IMG_SID hKernelMemInfo;
+#else
         IMG_HANDLE hKernelMemInfo;
-#endif 
-
-#if defined(SUPPORT_DRI_DRM)
-#if defined(PVR_SECURE_DRM_AUTH_EXPORT)
-        struct drm_file *psDRMFile;
+#endif
 
+#if defined(SUPPORT_DRI_DRM) && defined(PVR_SECURE_DRM_AUTH_EXPORT)
         
         struct list_head sDRMAuthListItem;
-#endif
 
-#if defined(PVR_LINUX_USING_WORKQUEUES)
-        struct work_struct sReleaseWork;
-#endif
-
-#if defined(SUPPORT_DRI_DRM_EXT)
-        IMG_PVOID pPriv;
-#endif
+        struct drm_file *psDRMFile;
 #endif
 
 #if defined(SUPPORT_MEMINFO_IDS)
@@ -70,6 +58,10 @@ typedef struct
 
         
         IMG_HANDLE hBlockAlloc;
+
+#if defined(SUPPORT_DRI_DRM_EXT)
+        IMG_PVOID pPriv;        
+#endif
 }
 PVRSRV_FILE_PRIVATE_DATA;