From 39b8c73486e2ee6634cccdcf5c1dbbd5601b7e31 Mon Sep 17 00:00:00 2001 From: Ander Conselvan de Oliveira Date: Wed, 15 Feb 2012 15:02:20 +0200 Subject: [PATCH] gfx: pvr: unifdef RES_MAN_EXTEND The PVRSRVGetResData function will be used in a follow up patches to implement support for creating drm fb's from mapped exported memory. Signed-off-by: Ander Conselvan de Oliveira Reviewed-by: Imre Deak Signed-off-by: Kirill A. Shutemov --- drivers/staging/mrst/pvr/services4/srvkm/common/resman.c | 3 --- drivers/staging/mrst/pvr/services4/srvkm/include/resman.h | 4 ---- 2 files changed, 7 deletions(-) diff --git a/drivers/staging/mrst/pvr/services4/srvkm/common/resman.c b/drivers/staging/mrst/pvr/services4/srvkm/common/resman.c index 672249e..d0e3e5d 100644 --- a/drivers/staging/mrst/pvr/services4/srvkm/common/resman.c +++ b/drivers/staging/mrst/pvr/services4/srvkm/common/resman.c @@ -731,8 +731,6 @@ static IMG_VOID ValidateResList(PRESMAN_LIST psResList) } #endif -#ifdef RES_MAN_EXTEND - IMG_PVOID PVRSRVGetResData(PRESMAN_ITEM psResItem) { if (psResItem) @@ -805,4 +803,3 @@ PVRSRV_ERROR PVRSRVResManAnyByCriteria(PRESMAN_CONTEXT psResManContext, return eError; } -#endif diff --git a/drivers/staging/mrst/pvr/services4/srvkm/include/resman.h b/drivers/staging/mrst/pvr/services4/srvkm/include/resman.h index cf78607..9852059 100644 --- a/drivers/staging/mrst/pvr/services4/srvkm/include/resman.h +++ b/drivers/staging/mrst/pvr/services4/srvkm/include/resman.h @@ -31,9 +31,7 @@ extern "C" { #endif -#ifdef RES_MAN_EXTEND #include -#endif #include "servicesext.h" enum { @@ -111,7 +109,6 @@ PVRSRV_ERROR PVRSRVResManConnect(IMG_HANDLE hPerProc, PRESMAN_CONTEXT *phResManContext); IMG_VOID PVRSRVResManDisconnect(PRESMAN_CONTEXT hResManContext, IMG_BOOL bKernelContext); -#ifdef RES_MAN_EXTEND PVRSRV_ERROR PVRSRVResManAnyByCriteria(PRESMAN_CONTEXT psResManContext, IMG_UINT32 ui32SearchCriteria, IMG_UINT32 ui32ResType, @@ -119,7 +116,6 @@ PVRSRV_ERROR PVRSRVResManAnyByCriteria(PRESMAN_CONTEXT psResManContext, IMG_UINT32 ui32Param, PVRSRV_ERROR(*pfnCallBack)(PRESMAN_ITEM psRes, va_list va), ...); IMG_PVOID PVRSRVGetResData(PRESMAN_ITEM psResItem); -#endif #if defined (__cplusplus) } -- 2.7.4