summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-08-23 10:54:45 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-08-23 10:54:45 +0100
commit0cd21ebcc51e6d2500e303446f68d86a6f473ccb (patch)
treea8318a34fbbb373403239b12e4ac921ab375e9a9 /arch/arm/mach-omap1
parentfcb8ce5cfe30ca9ca5c9a79cdfe26d1993e65e0c (diff)
parent97fef8bda9f32a2b1919501122d6bd6871af06dc (diff)
downloadblackbird-op-linux-0cd21ebcc51e6d2500e303446f68d86a6f473ccb.tar.gz
blackbird-op-linux-0cd21ebcc51e6d2500e303446f68d86a6f473ccb.zip
Merge branch 'dma-size' of git://git.yxit.co.uk/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-omap1')
-rw-r--r--arch/arm/mach-omap1/io.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c
index 870886a29594..1cfa1b6bb62b 100644
--- a/arch/arm/mach-omap1/io.c
+++ b/arch/arm/mach-omap1/io.c
@@ -121,6 +121,7 @@ void __init omap1_map_common_io(void)
#endif
omap_sram_init();
+ omap_init_consistent_dma_size();
}
/*
OpenPOWER on IntegriCloud