diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-12 10:53:51 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-12 10:53:51 +0100 |
| commit | c1af1638d406b3adf680a6b3b51d97d972e93efb (patch) | |
| tree | 30caee4fbcfcd4be096165f1187c954c430ec0cb /include | |
| parent | ababc78ed4680d5c24d22fe537e45e074fed08bc (diff) | |
| parent | 2b9b7cd782a5c2cfc3d5dc3d24e56aab6a9e2a4d (diff) | |
Merge branch 'consolidate-clksrc-i8253' into for-next
Conflicts:
drivers/clocksource/Kconfig
drivers/clocksource/Makefile
include/linux/clocksource.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/clocksource.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index a3558fdad480..4b6e185c14fd 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -349,4 +349,6 @@ extern cycle_t clocksource_mmio_readw_down(struct clocksource *); extern int clocksource_mmio_init(void __iomem *, const char *, unsigned long, int, unsigned, cycle_t (*)(struct clocksource *)); +extern int clocksource_i8253_init(void); + #endif /* _LINUX_CLOCKSOURCE_H */ |