summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-dove/common.h
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-01-27 23:03:23 -0800
committerOlof Johansson <olof@lixom.net>2013-01-27 23:03:34 -0800
commit66eae035dc59755c51ad3b3c718a5ed7535322e3 (patch)
treea30f914378e8c72c2885d2d53551d6e3fbf4bd6d /arch/arm/mach-dove/common.h
parentd128bc9131225f830fe7ba8c75b2b859348fddd4 (diff)
parentf8060f5446b1f2782f0a8ca9be2d870ea4198aee (diff)
downloadlinux-66eae035dc59755c51ad3b3c718a5ed7535322e3.tar.gz
linux-66eae035dc59755c51ad3b3c718a5ed7535322e3.tar.bz2
linux-66eae035dc59755c51ad3b3c718a5ed7535322e3.zip
Merge branch 'depends/cleanup' into next/soc
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-dove/common.h')
-rw-r--r--arch/arm/mach-dove/common.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-dove/common.h b/arch/arm/mach-dove/common.h
index 1a233404b735..ee59fba4c6d1 100644
--- a/arch/arm/mach-dove/common.h
+++ b/arch/arm/mach-dove/common.h
@@ -14,7 +14,7 @@
struct mv643xx_eth_platform_data;
struct mv_sata_platform_data;
-extern struct sys_timer dove_timer;
+extern void dove_timer_init(void);
/*
* Basic Dove init functions used early by machine-setup.