aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-mn10300/timex.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-10 10:01:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-10 10:01:49 -0700
commitd848223808c5d21e1b3cea090047e34722c6254b (patch)
treea869974378be9c20f311ad3d934eb3946e813a1a /include/asm-mn10300/timex.h
parent5de4c51d2a859a1556b7d20ae1278c3e2d70a79b (diff)
parent2f2a2132ff056bb45697dc855eb4fd95b70b38cb (diff)
downloadkernel_samsung_smdk4412-d848223808c5d21e1b3cea090047e34722c6254b.zip
kernel_samsung_smdk4412-d848223808c5d21e1b3cea090047e34722c6254b.tar.gz
kernel_samsung_smdk4412-d848223808c5d21e1b3cea090047e34722c6254b.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300
* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300: Separate out the proc- and unit-specific header directories from the general Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.
Diffstat (limited to 'include/asm-mn10300/timex.h')
-rw-r--r--include/asm-mn10300/timex.h33
1 files changed, 0 insertions, 33 deletions
diff --git a/include/asm-mn10300/timex.h b/include/asm-mn10300/timex.h
deleted file mode 100644
index 3944277..0000000
--- a/include/asm-mn10300/timex.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* MN10300 Architecture time management specifications
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-#ifndef _ASM_TIMEX_H
-#define _ASM_TIMEX_H
-
-#include <asm/hardirq.h>
-#include <asm/unit/timex.h>
-
-#define TICK_SIZE (tick_nsec / 1000)
-
-#define CLOCK_TICK_RATE 1193180 /* Underlying HZ - this should probably be set
- * to something appropriate, but what? */
-
-extern cycles_t cacheflush_time;
-
-#ifdef __KERNEL__
-
-static inline cycles_t get_cycles(void)
-{
- return read_timestamp_counter();
-}
-
-#endif /* __KERNEL__ */
-
-#endif /* _ASM_TIMEX_H */