diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2008-02-06 10:36:42 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 19:41:02 +0100 |
| commit | 941e492bdb1239d2ca8f5736cdfd3ff83d00cb90 (patch) | |
| tree | 6c048ee92ec94cbced1881308e14c2541321f077 /init | |
| parent | scheduled OSS driver removal (diff) | |
| download | linux-941e492bdb1239d2ca8f5736cdfd3ff83d00cb90.tar.xz linux-941e492bdb1239d2ca8f5736cdfd3ff83d00cb90.zip | |
read_current_timer() cleanups
- All implementations can be __devinit
- The function prototypes were in asm/timex.h but they all must be the same,
so create a single declaration in linux/timex.h.
- uninline the sparc64 version to match the other architectures
- Don't bother #defining ARCH_HAS_READ_CURRENT_TIMER to a particular value.
[ezk@cs.sunysb.edu: fix build]
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/calibrate.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/init/calibrate.c b/init/calibrate.c index 2d3d73bd4ce1..1d87891b6fcd 100644 --- a/init/calibrate.c +++ b/init/calibrate.c @@ -7,8 +7,7 @@ #include <linux/jiffies.h> #include <linux/delay.h> #include <linux/init.h> - -#include <asm/timex.h> +#include <linux/timex.h> unsigned long preset_lpj; static int __init lpj_setup(char *str) |