1 files changed, 43 insertions, 22 deletions

diff --git a/drivers/gpu/pvr/omap4/syslocal.h b/drivers/gpu/pvr/omap4/syslocal.h
index 766870f366c..bc7748c4705 100644
--- a/drivers/gpu/pvr/omap4/syslocal.h
+++ b/drivers/gpu/pvr/omap4/syslocal.h
@@ -1,26 +1,26 @@
 /**********************************************************************
  *
  * Copyright(c) 2008 Imagination Technologies Ltd. All rights reserved.
- *
+ * 
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
  * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful but, except
- * as otherwise stated in writing, without any warranty; without even the
- * implied warranty of merchantability or fitness for a particular purpose.
+ * 
+ * This program is distributed in the hope it will be useful but, except 
+ * as otherwise stated in writing, without any warranty; without even the 
+ * implied warranty of merchantability or fitness for a particular purpose. 
  * See the GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License along with
  * this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- *
+ * 
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
  *
  * Contact Information:
  * Imagination Technologies Ltd. <gpl-support@imgtec.com>
- * Home Park Estate, Kings Langley, Herts, WD4 8LZ, UK
+ * Home Park Estate, Kings Langley, Herts, WD4 8LZ, UK 
  *
  ******************************************************************************/
 
@@ -41,21 +41,21 @@
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26))
 #include <linux/semaphore.h>
 #include <linux/resource.h>
-#else
+#else 
 #include <asm/semaphore.h>
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22))
 #include <asm/arch/resource.h>
-#endif
-#endif
+#endif 
+#endif 
 
-#endif
+#endif 
 
 #if defined (__cplusplus)
 extern "C" {
 #endif
 
-
-
+ 
+ 
 IMG_CHAR *SysCreateVersionString(IMG_CPU_PHYADDR sRegRegion);
 
 IMG_VOID DisableSystemClocks(SYS_DATA *psSysData);
@@ -77,13 +77,14 @@ PVRSRV_ERROR EnableSGXClocks(SYS_DATA *psSysData);
 #define SYS_SPECIFIC_DATA_PM_UNINSTALL_LISR     0x00000200
 #define SYS_SPECIFIC_DATA_PM_DISABLE_SYSCLOCKS  0x00000400
 #define SYS_SPECIFIC_DATA_ENABLE_OCPREGS        0x00000800
+#define SYS_SPECIFIC_DATA_ENABLE_PM_RUNTIME     0x00001000
 
 #define SYS_SPECIFIC_DATA_SET(psSysSpecData, flag) ((IMG_VOID)((psSysSpecData)->ui32SysSpecificData |= (flag)))
 
 #define SYS_SPECIFIC_DATA_CLEAR(psSysSpecData, flag) ((IMG_VOID)((psSysSpecData)->ui32SysSpecificData &= ~(flag)))
 
 #define SYS_SPECIFIC_DATA_TEST(psSysSpecData, flag) (((psSysSpecData)->ui32SysSpecificData & (flag)) != 0)
-
+ 
 typedef struct _SYS_SPECIFIC_DATA_TAG_
 {
         IMG_UINT32      ui32SysSpecificData;
@@ -110,16 +111,11 @@ typedef struct _SYS_SPECIFIC_DATA_TAG_
         struct clk      *psSGX_FCK;
         struct clk      *psSGX_ICK;
         struct clk      *psMPU_CK;
-#if !defined(NO_OMAP_TIMER)
 #if defined(DEBUG) || defined(TIMING)
         struct clk      *psGPT11_FCK;
         struct clk      *psGPT11_ICK;
 #endif
-#endif
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,22))
-        struct constraint_handle *pVdd2Handle;
-#endif
-#endif
+#endif  
 } SYS_SPECIFIC_DATA;
 
 extern SYS_SPECIFIC_DATA *gpsSysSpecificData;
@@ -129,10 +125,35 @@ IMG_BOOL WrapSystemPowerChange(SYS_SPECIFIC_DATA *psSysSpecData);
 IMG_VOID UnwrapSystemPowerChange(SYS_SPECIFIC_DATA *psSysSpecData);
 #endif
 
-#if defined(__cplusplus)
+#if defined(__linux__)
+
+PVRSRV_ERROR SysPMRuntimeRegister(void);
+PVRSRV_ERROR SysPMRuntimeUnregister(void);
+
+#else 
+
+#ifdef INLINE_IS_PRAGMA
+#pragma inline(SysPMRuntimeRegister)
+#endif
+static INLINE PVRSRV_ERROR SysPMRuntimeRegister(void)
+{
+        return PVRSRV_OK;
 }
+
+#ifdef INLINE_IS_PRAGMA
+#pragma inline(SysPMRuntimeUnregister)
 #endif
+static INLINE PVRSRV_ERROR SysPMRuntimeUnregister(void)
+{
+        return PVRSRV_OK;
+}
+
+#endif 
 
+#if defined(__cplusplus)
+}
 #endif
 
+#endif  
+