diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-07-20 18:02:09 +0200 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-07-20 18:02:09 +0200 |
| commit | 4439c06398d46eafc69ea52414418d3ffb27bfe7 (patch) | |
| tree | b82f0eac135eb0ea9f60b829ece153ac62bff6ad /drivers/gpu/pvr/pvr_bridge.h | |
| parent | 632456bcbac1cacb988883c915174cf841a883f8 (diff) | |
| parent | d45c5b0622ff2099402a09eae29a01e9fdb96bdf (diff) | |
| download | kernel_samsung_crespo-4439c06398d46eafc69ea52414418d3ffb27bfe7.tar.gz kernel_samsung_crespo-4439c06398d46eafc69ea52414418d3ffb27bfe7.tar.bz2 kernel_samsung_crespo-4439c06398d46eafc69ea52414418d3ffb27bfe7.zip | |
Merge remote-tracking branch 'google/android-samsung-3.0-jb' into HEAD
Conflicts:
arch/arm/mach-s5pv210/mach-herring.c
drivers/media/video/samsung/fimc/fimc_dev.c
include/trace/events/cpufreq_interactive.h
Diffstat (limited to 'drivers/gpu/pvr/pvr_bridge.h')
| -rw-r--r-- | drivers/gpu/pvr/pvr_bridge.h | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/drivers/gpu/pvr/pvr_bridge.h b/drivers/gpu/pvr/pvr_bridge.h index d3e5916a9db..443ad1eb596 100644 --- a/drivers/gpu/pvr/pvr_bridge.h +++ b/drivers/gpu/pvr/pvr_bridge.h @@ -191,11 +191,7 @@ extern "C" { #define PVRSRV_BRIDGE_UNMAP_MEMINFO_MEM PVRSRV_IOWR(PVRSRV_BRIDGE_SHAREDMEM_CMD_FIRST+3) #define PVRSRV_BRIDGE_SHAREDMEM_CMD_LAST (PVRSRV_BRIDGE_SHAREDMEM_CMD_FIRST+3) -#define PVRSRV_BRIDGE_SERVICES4_TMP_CMD_FIRST (PVRSRV_BRIDGE_SHAREDMEM_CMD_LAST+1) -#define PVRSRV_BRIDGE_GETMMU_PD_DEVPADDR PVRSRV_IOWR(PVRSRV_BRIDGE_SERVICES4_TMP_CMD_FIRST+0) -#define PVRSRV_BRIDGE_SERVICES4_TMP_CMD_LAST (PVRSRV_BRIDGE_SERVICES4_TMP_CMD_FIRST+0) - -#define PVRSRV_BRIDGE_INITSRV_CMD_FIRST (PVRSRV_BRIDGE_SERVICES4_TMP_CMD_LAST+1) +#define PVRSRV_BRIDGE_INITSRV_CMD_FIRST (PVRSRV_BRIDGE_SHAREDMEM_CMD_LAST+1) #define PVRSRV_BRIDGE_INITSRV_CONNECT PVRSRV_IOWR(PVRSRV_BRIDGE_INITSRV_CMD_FIRST+0) #define PVRSRV_BRIDGE_INITSRV_DISCONNECT PVRSRV_IOWR(PVRSRV_BRIDGE_INITSRV_CMD_FIRST+1) #define PVRSRV_BRIDGE_INITSRV_CMD_LAST (PVRSRV_BRIDGE_INITSRV_CMD_FIRST+1) @@ -1595,22 +1591,6 @@ typedef struct PVRSRV_BRIDGE_OUT_UNMAP_MEMINFO_MEM_TAG PVRSRV_ERROR eError; }PVRSRV_BRIDGE_OUT_UNMAP_MEMINFO_MEM; -typedef struct PVRSRV_BRIDGE_IN_GETMMU_PD_DEVPADDR_TAG -{ - IMG_UINT32 ui32BridgeFlags; -#if defined (SUPPORT_SID_INTERFACE) - IMG_SID hDevMemContext; -#else - IMG_HANDLE hDevMemContext; -#endif -}PVRSRV_BRIDGE_IN_GETMMU_PD_DEVPADDR; - -typedef struct PVRSRV_BRIDGE_OUT_GETMMU_PD_DEVPADDR_TAG -{ - IMG_DEV_PHYADDR sPDDevPAddr; - PVRSRV_ERROR eError; -}PVRSRV_BRIDGE_OUT_GETMMU_PD_DEVPADDR; - typedef struct PVRSRV_BRIDGE_IN_EVENT_OBJECT_WAI_TAG { IMG_UINT32 ui32BridgeFlags; |