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/Makefile | |
| parent | 632456bcbac1cacb988883c915174cf841a883f8 (diff) | |
| parent | d45c5b0622ff2099402a09eae29a01e9fdb96bdf (diff) | |
| download | kernel_samsung_crespo-4439c06398d46eafc69ea52414418d3ffb27bfe7.zip kernel_samsung_crespo-4439c06398d46eafc69ea52414418d3ffb27bfe7.tar.gz kernel_samsung_crespo-4439c06398d46eafc69ea52414418d3ffb27bfe7.tar.bz2 | |
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/Makefile')
| -rw-r--r-- | drivers/gpu/pvr/Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/pvr/Makefile b/drivers/gpu/pvr/Makefile index 22d626e..d428d50 100644 --- a/drivers/gpu/pvr/Makefile +++ b/drivers/gpu/pvr/Makefile @@ -36,6 +36,8 @@ ccflags-y += \ -DPVRSRV_MODNAME="\"pvrsrvkm\"" \ -Idrivers/gpu/pvr/sgx \ -DSUPPORT_GET_DC_BUFFERS_SYS_PHYADDRS \ + -DPVRSRV_MMU_MAKE_READWRITE_ON_DEMAND \ + -DPVRSRV_AVOID_RANGED_INVALIDATE \ -DPVR_LDM_DRIVER_REGISTRATION_NAME="\"pvrsrvkm\"" ccflags-$(CONFIG_PVR_BUILD_RELEASE) += \ @@ -65,6 +67,10 @@ ccflags-$(CONFIG_PVR_DUMP_MK_TRACE) += -DPVRSRV_DUMP_MK_TRACE ccflags-$(CONFIG_PVR_PDUMP) += \ -DPDUMP -DSUPPORT_PDUMP_MULTI_PROCESS +ccflags-$(CONFIG_PVR_LINUX_MEM_AREA_POOL) += \ + -DPVR_LINUX_MEM_AREA_POOL_MAX_PAGES=CONFIG_PVR_LINUX_MEM_AREA_POOL_MAX_PAGES \ + -DPVR_LINUX_MEM_AREA_USE_VMAP -DPVR_LINUX_MEM_AREA_POOL_ALLOW_SHRINK + pvrsrvkm-y := \ osfunc.o \ mutils.o \ |