From 88234890ea8fd8f60101c0b9690f1ea756cc3c5b Mon Sep 17 00:00:00 2001 From: Justin Date: Mon, 25 Mar 2013 18:06:02 -0500 Subject: smdk4412: mali: merge with r3p1 driver from note8 Change-Id: I75db69081b986ec326fe347f73aa3655648e6b81 --- drivers/media/video/samsung/ump/Kconfig | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'drivers/media/video/samsung/ump/Kconfig') diff --git a/drivers/media/video/samsung/ump/Kconfig b/drivers/media/video/samsung/ump/Kconfig index aaae26e..9d8e5e6 100644 --- a/drivers/media/video/samsung/ump/Kconfig +++ b/drivers/media/video/samsung/ump/Kconfig @@ -17,10 +17,18 @@ config UMP_VCM_ALLOC help Use VCM(virtual-contiguous-memory) to allocate physical memory. + +config UMP_R3P1_LSI + bool "Uses the R3P1 as a ump module" + depends on VIDEO_UMP + default n + ---help--- + This uses the r3p1 as a UMP kernel module + choice depends on VIDEO_UMP prompt "UMP MEMEMORY OPTION" -default UMP_OSMEM_ONLY +default UMP_OSMEM_ONLY config UMP_DED_ONLY bool "ump dedicated memory only" ---help--- @@ -37,7 +45,7 @@ config UMP_VCM_ONLY endchoice config UMP_MEM_SIZE int "UMP Memory Size" - depends on VIDEO_UMP + depends on VIDEO_UMP default "512" ---help--- This value is dedicated memory size of UMP (unit is MByte). @@ -48,4 +56,3 @@ config VIDEO_UMP_DEBUG default n help This enables UMP driver debug messages. - -- cgit v1.1