diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:11:46 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 00:25:01 +0100 |
commit | 5725aeae5ff2e39f3815bbef788ee326c9afea2c (patch) | |
tree | 4f32f936ba18384d48ab1e537b787a8ce666263f /arch/arm/mach-davinci/common.c | |
parent | Merge branch 'depends/rmk/gpio' into next/fixes (diff) | |
parent | ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H (diff) | |
download | linux-5725aeae5ff2e39f3815bbef788ee326c9afea2c.tar.xz linux-5725aeae5ff2e39f3815bbef788ee326c9afea2c.zip |
Merge branch 'depends/rmk/memory_h' into next/fixes
Fix up all conflicts between the memory.h cleanup and bug fixes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-davinci/common.c')
-rw-r--r-- | arch/arm/mach-davinci/common.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/common.c b/arch/arm/mach-davinci/common.c index 1d2557394235..865ffe5899ac 100644 --- a/arch/arm/mach-davinci/common.c +++ b/arch/arm/mach-davinci/common.c @@ -12,6 +12,7 @@ #include <linux/io.h> #include <linux/etherdevice.h> #include <linux/davinci_emac.h> +#include <linux/dma-mapping.h> #include <asm/tlb.h> #include <asm/mach/map.h> @@ -86,6 +87,8 @@ void __init davinci_common_init(struct davinci_soc_info *soc_info) iotable_init(davinci_soc_info.io_desc, davinci_soc_info.io_desc_num); + init_consistent_dma_size(14 << 20); + /* * Normally devicemaps_init() would flush caches and tlb after * mdesc->map_io(), but we must also do it here because of the CPU |