diff options
author | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 15:02:37 -0400 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 15:02:37 -0400 |
commit | 3a8254364277fabe01bc0e12b9691722939f5ef3 (patch) | |
tree | 0befa43780509144cc840f767859006409e0506d /arch/arm/plat-omap/io.c | |
parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
parent | 34471a9168c8bfd7f0d00989a7b0797ad27d585e (diff) |
Merge remote-tracking branch 'rmk/devel-stable' into HEAD
Diffstat (limited to 'arch/arm/plat-omap/io.c')
-rw-r--r-- | arch/arm/plat-omap/io.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/io.c b/arch/arm/plat-omap/io.c index f1ecfa9fc61..e9b0e23edd0 100644 --- a/arch/arm/plat-omap/io.c +++ b/arch/arm/plat-omap/io.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
13 | #include <linux/io.h> | 13 | #include <linux/io.h> |
14 | #include <linux/mm.h> | 14 | #include <linux/mm.h> |
15 | #include <linux/dma-mapping.h> | ||
15 | 16 | ||
16 | #include <plat/omap7xx.h> | 17 | #include <plat/omap7xx.h> |
17 | #include <plat/omap1510.h> | 18 | #include <plat/omap1510.h> |
@@ -139,3 +140,10 @@ void omap_iounmap(volatile void __iomem *addr) | |||
139 | __iounmap(addr); | 140 | __iounmap(addr); |
140 | } | 141 | } |
141 | EXPORT_SYMBOL(omap_iounmap); | 142 | EXPORT_SYMBOL(omap_iounmap); |
143 | |||
144 | void __init omap_init_consistent_dma_size(void) | ||
145 | { | ||
146 | #ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE | ||
147 | init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20); | ||
148 | #endif | ||
149 | } | ||