diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-21 20:27:47 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-21 20:27:47 -0400 |
| commit | 99ce567ba912109c78762246c964327f3f81f27d (patch) | |
| tree | 685265d60792c11d386db6c005ca8b8e714ecc23 /arch/m68knommu/platform/coldfire/dma_timer.c | |
| parent | 8fb2bae4b41eb64f6e233e9bd3f3a789fbb04a06 (diff) | |
| parent | ccc5ff94c66e628d3c501b26ace5d4339667715d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/m68knommu/platform/coldfire/dma_timer.c')
| -rw-r--r-- | arch/m68knommu/platform/coldfire/dma_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68knommu/platform/coldfire/dma_timer.c b/arch/m68knommu/platform/coldfire/dma_timer.c index 772578b1084f..a5f562823d7a 100644 --- a/arch/m68knommu/platform/coldfire/dma_timer.c +++ b/arch/m68knommu/platform/coldfire/dma_timer.c | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | #define DMA_DTMR_CLK_DIV_16 (2 << 1) | 34 | #define DMA_DTMR_CLK_DIV_16 (2 << 1) |
| 35 | #define DMA_DTMR_ENABLE (1 << 0) | 35 | #define DMA_DTMR_ENABLE (1 << 0) |
| 36 | 36 | ||
| 37 | static cycle_t cf_dt_get_cycles(void) | 37 | static cycle_t cf_dt_get_cycles(struct clocksource *cs) |
| 38 | { | 38 | { |
| 39 | return __raw_readl(DTCN0); | 39 | return __raw_readl(DTCN0); |
| 40 | } | 40 | } |