diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-06 17:05:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-06 17:05:57 -0400 |
| commit | f560902c2d39c255bd67c0211f5dd80edb97a712 (patch) | |
| tree | c45601159db0808e76c78212c74885cd219b2866 /arch/microblaze/include/asm/timex.h | |
| parent | 9861df15f44d98eb6fa9a839b558633ecee87194 (diff) | |
| parent | db6e3f91efd2cf61b9965f722902199cf54adc4f (diff) | |
Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze
* 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Fix cast warning for init.c
microblaze: Wire up new syscalls
microblaze: use generic syscalls.h
microblaze: clean up signal handling
microblaze: convert all simple headers to use asm-generic
microblaze: use the generic lib/checksum.c
microblaze: fall back on generic header files for the ABI
Diffstat (limited to 'arch/microblaze/include/asm/timex.h')
| -rw-r--r-- | arch/microblaze/include/asm/timex.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/microblaze/include/asm/timex.h b/arch/microblaze/include/asm/timex.h index 678525dc6d0b..befcf3de5532 100644 --- a/arch/microblaze/include/asm/timex.h +++ b/arch/microblaze/include/asm/timex.h | |||
| @@ -9,10 +9,8 @@ | |||
| 9 | #ifndef _ASM_MICROBLAZE_TIMEX_H | 9 | #ifndef _ASM_MICROBLAZE_TIMEX_H |
| 10 | #define _ASM_MICROBLAZE_TIMEX_H | 10 | #define _ASM_MICROBLAZE_TIMEX_H |
| 11 | 11 | ||
| 12 | #define CLOCK_TICK_RATE 1000 /* Timer input freq. */ | 12 | #include <asm-generic/timex.h> |
| 13 | |||
| 14 | typedef unsigned long cycles_t; | ||
| 15 | 13 | ||
| 16 | #define get_cycles() (0) | 14 | #define CLOCK_TICK_RATE 1000 /* Timer input freq. */ |
| 17 | 15 | ||
| 18 | #endif /* _ASM_TIMEX_H */ | 16 | #endif /* _ASM_TIMEX_H */ |