aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/samsung/mali/arch-orion-m400/config.h
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-22 15:04:56 +0200
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-22 15:04:56 +0200
commitb99374450c03bf5081b88995d91d34fb9b2fd040 (patch)
treeb6f525d915504ad8bd99bdb2dadcca345a4ad3a3 /drivers/media/video/samsung/mali/arch-orion-m400/config.h
parenta39819e88ea4546218b581d7f061a99ca91d825b (diff)
parente2f984e707f517f24041b70018770b20b71cb6a6 (diff)
downloadkernel_samsung_smdk4412-b99374450c03bf5081b88995d91d34fb9b2fd040.zip
kernel_samsung_smdk4412-b99374450c03bf5081b88995d91d34fb9b2fd040.tar.gz
kernel_samsung_smdk4412-b99374450c03bf5081b88995d91d34fb9b2fd040.tar.bz2
Merge remote-tracking branch 'github/cm-11.0'
Conflicts: firmware/Makefile firmware/epen/W9001_B713.bin.ihex firmware/epen/W9001_B746.bin.ihex firmware/epen/W9001_B746JD.bin.ihex firmware/epen/W9001_B746L.bin.ihex firmware/epen/W9001_B746S.bin.ihex
Diffstat (limited to 'drivers/media/video/samsung/mali/arch-orion-m400/config.h')
-rw-r--r--drivers/media/video/samsung/mali/arch-orion-m400/config.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/samsung/mali/arch-orion-m400/config.h b/drivers/media/video/samsung/mali/arch-orion-m400/config.h
index 5c4d79d..73502a2 100644
--- a/drivers/media/video/samsung/mali/arch-orion-m400/config.h
+++ b/drivers/media/video/samsung/mali/arch-orion-m400/config.h
@@ -130,7 +130,7 @@ static _mali_osk_resource_t arch_configuration [] =
#endif/* if USING_OS_MEMORY*/
{
.type = MEM_VALIDATION,
- .description = "memory validation",
+ .description = "Framebuffer Memory",
.base = MEM_BASE_ADDR,
.size = MEM_TOTAL_SIZE,
.flags = _MALI_CPU_WRITEABLE | _MALI_CPU_READABLE | _MALI_PP_READABLE | _MALI_PP_WRITEABLE | _MALI_GP_READABLE | _MALI_GP_WRITEABLE | _MALI_MMU_READABLE | _MALI_MMU_WRITEABLE