From 98c68b1f4f7527cfaacfabd30851dbf356cecdb5 Mon Sep 17 00:00:00 2001 From: Jon Medhurst Date: Mon, 22 Aug 2011 10:47:56 +0100 Subject: [PATCH] --- yaml --- r: 270041 b: refs/heads/master c: 389d12cc7f9715771f6db64b4be1fc3d25576a57 h: refs/heads/master i: 270039: 83784e571c7ba9fb97636b7597517c2b2c3af260 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-mxc/include/mach/memory.h | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 112f1fbe117c..a6a64cee401d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a06a58abec1980b0fffbd07930aad6e7185d7a90 +refs/heads/master: 389d12cc7f9715771f6db64b4be1fc3d25576a57 diff --git a/trunk/arch/arm/plat-mxc/include/mach/memory.h b/trunk/arch/arm/plat-mxc/include/mach/memory.h index 11be5cdbdd1a..3ec84b902243 100644 --- a/trunk/arch/arm/plat-mxc/include/mach/memory.h +++ b/trunk/arch/arm/plat-mxc/include/mach/memory.h @@ -40,19 +40,4 @@ # endif #endif -#if defined(CONFIG_MX3_VIDEO) -/* - * Increase size of DMA-consistent memory region. - * This is required for mx3 camera driver to capture at least two QXGA frames. - */ -#define CONSISTENT_DMA_SIZE SZ_8M - -#elif defined(CONFIG_MX1_VIDEO) || defined(CONFIG_VIDEO_MX2_HOSTSUPPORT) -/* - * Increase size of DMA-consistent memory region. - * This is required for i.MX camera driver to capture at least four VGA frames. - */ -#define CONSISTENT_DMA_SIZE SZ_4M -#endif /* CONFIG_MX1_VIDEO || CONFIG_VIDEO_MX2_HOSTSUPPORT */ - #endif /* __ASM_ARCH_MXC_MEMORY_H__ */