git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
[safe/jmp/linux-2.6]
/
drivers
/
clocksource
/
cyclone.c
diff --git
a/drivers/clocksource/cyclone.c
b/drivers/clocksource/cyclone.c
index
8615059
..
64e528e
100644
(file)
--- a/
drivers/clocksource/cyclone.c
+++ b/
drivers/clocksource/cyclone.c
@@
-19,7
+19,7
@@
int use_cyclone = 0;
static void __iomem *cyclone_ptr;
-static cycle_t read_cyclone(
void
)
+static cycle_t read_cyclone(
struct clocksource *cs
)
{
return (cycle_t)readl(cyclone_ptr);
}