From 83256a07fd491095e7674a1cc64e6f7e7846bbd8 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Fri, 24 Feb 2012 10:34:33 -0800 Subject: [PATCH] --- yaml --- r: 295623 b: refs/heads/master c: a4f34197120be8edfe099bb6cde35740d299b6d1 h: refs/heads/master i: 295621: 7f3e189082fd2dda0e7809b8bffbdbf5785938f5 295619: f58c102b6da70a5df4c1d207a4ead3b9dfbfa349 295615: 133bbbe1370e1a2c704b12747de16092ffe31ebc v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap1/common.h | 1 + trunk/arch/arm/mach-omap2/common.h | 2 ++ trunk/arch/arm/plat-omap/include/plat/io.h | 2 -- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 110d2f9261aa..5323a5fa243b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 258ee922d7a4b4a9cfb947ce0e24d89f1ef20eb5 +refs/heads/master: a4f34197120be8edfe099bb6cde35740d299b6d1 diff --git a/trunk/arch/arm/mach-omap1/common.h b/trunk/arch/arm/mach-omap1/common.h index a9a5146dd2d4..af658ad338ec 100644 --- a/trunk/arch/arm/mach-omap1/common.h +++ b/trunk/arch/arm/mach-omap1/common.h @@ -58,5 +58,6 @@ void omap1_restart(char, const char *); extern struct sys_timer omap1_timer; extern bool omap_32k_timer_init(void); +extern void __init omap_init_consistent_dma_size(void); #endif /* __ARCH_ARM_MACH_OMAP1_COMMON_H */ diff --git a/trunk/arch/arm/mach-omap2/common.h b/trunk/arch/arm/mach-omap2/common.h index 5aa1acbcc33e..f78ec4e6a5c7 100644 --- a/trunk/arch/arm/mach-omap2/common.h +++ b/trunk/arch/arm/mach-omap2/common.h @@ -133,6 +133,8 @@ void am33xx_map_io(void); void omap4_map_io(void); void ti81xx_map_io(void); +extern void __init omap_init_consistent_dma_size(void); + /** * omap_test_timeout - busy-loop, testing a condition * @cond: condition to test until it evaluates to true diff --git a/trunk/arch/arm/plat-omap/include/plat/io.h b/trunk/arch/arm/plat-omap/include/plat/io.h index f5b386b76361..28cd79658633 100644 --- a/trunk/arch/arm/plat-omap/include/plat/io.h +++ b/trunk/arch/arm/plat-omap/include/plat/io.h @@ -266,8 +266,6 @@ extern void omap_writeb(u8 v, u32 pa); extern void omap_writew(u16 v, u32 pa); extern void omap_writel(u32 v, u32 pa); -extern void __init omap_init_consistent_dma_size(void); - #endif #endif