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 'consolidate-clksrc-i8253' of master.kernel.org:~rmk/linux-2.6-arm into...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
i8253.c
diff --git
a/arch/x86/kernel/i8253.c
b/arch/x86/kernel/i8253.c
index
b904dfb
..
577e90c
100644
(file)
--- a/
arch/x86/kernel/i8253.c
+++ b/
arch/x86/kernel/i8253.c
@@
-133,5
+133,4
@@
static int __init init_pit_clocksource(void)
return clocksource_i8253_init();
}
arch_initcall(init_pit_clocksource);
-
#endif /* !CONFIG_X86_64 */