diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 17:23:28 +0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 17:23:28 +0400 |
commit | 929f58aeeb46f964d9468ce1addd993f5d92b11d (patch) | |
tree | 95355731bd4d21d221cdc2a5ab073244ff76db65 /arch/arm/plat-omap/include/plat/io.h | |
parent | fcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (diff) | |
parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
download | linux-929f58aeeb46f964d9468ce1addd993f5d92b11d.tar.xz |
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
Diffstat (limited to 'arch/arm/plat-omap/include/plat/io.h')
-rw-r--r-- | arch/arm/plat-omap/include/plat/io.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/io.h b/arch/arm/plat-omap/include/plat/io.h index d72ec85c97e6..ebe67ea8d068 100644 --- a/arch/arm/plat-omap/include/plat/io.h +++ b/arch/arm/plat-omap/include/plat/io.h @@ -309,6 +309,8 @@ extern void omap2_init_common_devices(struct omap_sdrc_params *sdrc_cs0, void __iomem *omap_ioremap(unsigned long phys, size_t size, unsigned int type); void omap_iounmap(volatile void __iomem *addr); +extern void __init omap_init_consistent_dma_size(void); + #endif #endif |