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
/
x86
/
kernel
/
i8253.c
diff --git
a/arch/x86/kernel/i8253.c
b/arch/x86/kernel/i8253.c
index
3475440
..
c2e0bb0
100644
(file)
--- a/
arch/x86/kernel/i8253.c
+++ b/
arch/x86/kernel/i8253.c
@@
-129,7
+129,7
@@
void __init setup_pit_timer(void)
* to just read by itself. So use jiffies to emulate a free
* running counter:
*/
-static cycle_t pit_read(
void
)
+static cycle_t pit_read(
struct clocksource *cs
)
{
static int old_count;
static u32 old_jifs;