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
/
m68knommu
/
platform
/
coldfire
/
pit.c
diff --git
a/arch/m68knommu/platform/coldfire/pit.c
b/arch/m68knommu/platform/coldfire/pit.c
index
2a12e7f
..
61b9621
100644
(file)
--- a/
arch/m68knommu/platform/coldfire/pit.c
+++ b/
arch/m68knommu/platform/coldfire/pit.c
@@
-125,7
+125,7
@@
static struct irqaction pit_irq = {
/***************************************************************************/
-static cycle_t pit_read_clk(
void
)
+static cycle_t pit_read_clk(
struct clocksource *cs
)
{
unsigned long flags;
u32 cycles;