summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/common.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-03-06 06:16:26 +0400
committerDavid S. Miller <davem@davemloft.net>2012-03-06 06:16:26 +0400
commitf6a1ad4295f9291038380178d09978caf6982dd8 (patch)
tree7c35e8efe1812baca9c6b9674be1ee02a0495ec3 /arch/arm/mach-omap2/common.h
parent036dafa28da1e2565a8529de2ae663c37b7a0060 (diff)
parentf3969bf78f140f437f51787dfc2751943ba454d1 (diff)
downloadlinux-f6a1ad4295f9291038380178d09978caf6982dd8.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/net/vmxnet3/vmxnet3_drv.c Small vmxnet3 conflict with header size bug fix in 'net'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/mach-omap2/common.h')
-rw-r--r--arch/arm/mach-omap2/common.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index febffde2ff10..7e9338e8d684 100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -132,6 +132,7 @@ void omap3_map_io(void);
void am33xx_map_io(void);
void omap4_map_io(void);
void ti81xx_map_io(void);
+void omap_barriers_init(void);
/**
* omap_test_timeout - busy-loop, testing a condition