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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
arch
/
m68knommu
/
platform
/
coldfire
/
dma_timer.c
diff --git
a/arch/m68knommu/platform/coldfire/dma_timer.c
b/arch/m68knommu/platform/coldfire/dma_timer.c
index
772578b
..
a5f5628
100644
(file)
--- a/
arch/m68knommu/platform/coldfire/dma_timer.c
+++ b/
arch/m68knommu/platform/coldfire/dma_timer.c
@@
-34,7
+34,7
@@
#define DMA_DTMR_CLK_DIV_16 (2 << 1)
#define DMA_DTMR_ENABLE (1 << 0)
-static cycle_t cf_dt_get_cycles(
void
)
+static cycle_t cf_dt_get_cycles(
struct clocksource *cs
)
{
return __raw_readl(DTCN0);
}