git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.39' of git://linux-nfs.org/~bfields/linux
[pandora-kernel.git]
/
arch
/
arm
/
mach-footbridge
/
dc21285-timer.c
diff --git
a/arch/arm/mach-footbridge/dc21285-timer.c
b/arch/arm/mach-footbridge/dc21285-timer.c
index
a921fe9
..
5f1f986
100644
(file)
--- a/
arch/arm/mach-footbridge/dc21285-timer.c
+++ b/
arch/arm/mach-footbridge/dc21285-timer.c
@@
-30,7
+30,7
@@
static int cksrc_dc21285_enable(struct clocksource *cs)
return 0;
}
-static
int
cksrc_dc21285_disable(struct clocksource *cs)
+static
void
cksrc_dc21285_disable(struct clocksource *cs)
{
*CSR_TIMER2_CNTL = 0;
}