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 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
hpet.c
diff --git
a/arch/x86/kernel/hpet.c
b/arch/x86/kernel/hpet.c
index
ad80a1c
..
ee4fa1b
100644
(file)
--- a/
arch/x86/kernel/hpet.c
+++ b/
arch/x86/kernel/hpet.c
@@
-266,7
+266,7
@@
static void hpet_resume_device(void)
force_hpet_resume();
}
-static void hpet_resume_counter(
void
)
+static void hpet_resume_counter(
struct clocksource *cs
)
{
hpet_resume_device();
hpet_restart_counter();