diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-21 15:09:45 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-21 15:09:45 -0300 |
commit | 0b8face2f09a06c0608472c22fe5a704b6dc4c0e (patch) | |
tree | 39d774e364a86e831312c1568cd8438afcd773c8 /linux/arch/arm/plat-mxc | |
parent | 04ef26ec109fff2b6d310da4dabdafc4135ad058 (diff) | |
parent | 85a3fd2b44d6162a4288a264537c287adf79b4f9 (diff) | |
download | mediapointer-dvb-s2-0b8face2f09a06c0608472c22fe5a704b6dc4c0e.tar.gz mediapointer-dvb-s2-0b8face2f09a06c0608472c22fe5a704b6dc4c0e.tar.bz2 |
merge: http://kernellabs.com/hg/~mkrufky/bug-fix
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/arch/arm/plat-mxc')
-rw-r--r-- | linux/arch/arm/plat-mxc/include/mach/memory.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/linux/arch/arm/plat-mxc/include/mach/memory.h b/linux/arch/arm/plat-mxc/include/mach/memory.h index eca37d09f..6065e0017 100644 --- a/linux/arch/arm/plat-mxc/include/mach/memory.h +++ b/linux/arch/arm/plat-mxc/include/mach/memory.h @@ -32,4 +32,12 @@ #define CONSISTENT_DMA_SIZE SZ_4M #endif /* CONFIG_MX1_VIDEO */ +#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 +#endif /* CONFIG_MX3_VIDEO */ + #endif /* __ASM_ARCH_MXC_MEMORY_H__ */ |