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-2.6.31' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
[pandora-kernel.git]
/
arch
/
sh
/
include
/
asm
/
timex.h
diff --git
a/arch/sh/include/asm/timex.h
b/arch/sh/include/asm/timex.h
index
a873e24
..
b556d49
100644
(file)
--- a/
arch/sh/include/asm/timex.h
+++ b/
arch/sh/include/asm/timex.h
@@
-8,11
+8,6
@@
#define CLOCK_TICK_RATE (CONFIG_SH_PCLK_FREQ / 4) /* Underlying HZ */
-typedef unsigned long long cycles_t;
-
-static __inline__ cycles_t get_cycles (void)
-{
- return 0;
-}
+#include <asm-generic/timex.h>
#endif /* __ASM_SH_TIMEX_H */