summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/timer.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-05-09 02:28:08 -0700
committerOlof Johansson <olof@lixom.net>2012-05-09 02:28:46 -0700
commitcba3309e38cf0407fbdbea788758ad65624c2319 (patch)
treef93dfd4451c1d67f2b05626e7f6c98e519abf35a /arch/arm/mach-omap1/timer.c
parent976eb445e2051735346779dbdaeb681c7641fec4 (diff)
parent09f45b83109cb8e23a06d5efb1096a08a9545974 (diff)
downloadlinux-cba3309e38cf0407fbdbea788758ad65624c2319.tar.bz2
Merge tag 'omap-cleanup-sparse-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
Sparse and cppcheck warning fixes By Paul Walmsley via Paul Walmsley (1) and Tony Lindgren (1) * tag 'omap-cleanup-sparse-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: clean up some cppcheck warnings ARM: OMAP1: board files: deduplicate and clean some NAND-related code ARM: OMAP: USB: remove unnecessary sideways include ARM: OMAP: DMA: use constant array maximum, drop some LCD DMA code ARM: OMAP: OCM RAM: use memset_io() when clearing SRAM ARM: OMAP: fix 'using plain integer as NULL pointer' sparse warnings ARM: OMAP2+: GPMC: resolve type-conversion warning from sparse ARM: OMAP1: OHCI: use platform_data fn ptr to enable OCPI bus ARM: OMAP1: OCPI: move to mach-omap1/ ARM: OMAP: add includes for missing prototypes ARM: OMAP2+: declare file-local functions as static Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-omap1/timer.c')
-rw-r--r--arch/arm/mach-omap1/timer.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/timer.c b/arch/arm/mach-omap1/timer.c
index fb202af01d0d..64c65bcb2d67 100644
--- a/arch/arm/mach-omap1/timer.c
+++ b/arch/arm/mach-omap1/timer.c
@@ -54,8 +54,7 @@ static int omap1_dm_timer_set_src(struct platform_device *pdev,
return 0;
}
-
-int __init omap1_dm_timer_init(void)
+static int __init omap1_dm_timer_init(void)
{
int i;
int ret;