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 'topic/hda' into for-linus
[pandora-kernel.git]
/
arch
/
ia64
/
kernel
/
time.c
diff --git
a/arch/ia64/kernel/time.c
b/arch/ia64/kernel/time.c
index
641c8b6
..
604c1a3
100644
(file)
--- a/
arch/ia64/kernel/time.c
+++ b/
arch/ia64/kernel/time.c
@@
-33,7
+33,7
@@
#include "fsyscall_gtod_data.h"
#include "fsyscall_gtod_data.h"
-static cycle_t itc_get_cycles(
void
);
+static cycle_t itc_get_cycles(
struct clocksource *cs
);
struct fsyscall_gtod_data_t fsyscall_gtod_data = {
.lock = SEQLOCK_UNLOCKED,
struct fsyscall_gtod_data_t fsyscall_gtod_data = {
.lock = SEQLOCK_UNLOCKED,
@@
-383,7
+383,7
@@
ia64_init_itm (void)
}
}
}
}
-static cycle_t itc_get_cycles(
void
)
+static cycle_t itc_get_cycles(
struct clocksource *cs
)
{
u64 lcycle, now, ret;
{
u64 lcycle, now, ret;