diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-28 12:34:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-28 12:34:01 -0700 |
| commit | 604a2785a8482cad4d63202465133c720db5eda7 (patch) | |
| tree | e2f510a8a54d7d4443cb52f3a0be46f527ebb779 /include/asm-blackfin/timex.h | |
| parent | 66833d5f3934a19d0988b7d0de58149bfd7a5884 (diff) | |
| parent | d310fb4bb73629840430cb13cb282915e49fef4b (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
Blackfin arch: Fix PM building on BF52x: No ROTWE on BF52x, add USBWE
Blackfin arch: sram: use 'unsigned long' for irqflags
Blackfin arch: let PCI depend on BROKEN
Blackfin arch: move include/asm-blackfin header files to arch/blackfin
Blackfin arch: fix bug - MPU crashes under stress
Blackfin arch: Fix bug - when to rmmod the L1_module, it stucks and then reboot the board.
Blackfin arch: dont actually need to muck with EMAC_SYSTAT for BF52x for demuxing
Blackfin arch: Add MTD Partitions for MTD_DATAFLASH, increase max SPI SCLK
Diffstat (limited to 'include/asm-blackfin/timex.h')
| -rw-r--r-- | include/asm-blackfin/timex.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/include/asm-blackfin/timex.h b/include/asm-blackfin/timex.h deleted file mode 100644 index 22b0806161b..00000000000 --- a/include/asm-blackfin/timex.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * asm-blackfin/timex.h: cpu cycles! - * - * Copyright 2004-2008 Analog Devices Inc. - * - * Licensed under the GPL-2 or later. - */ - -#ifndef _ASM_BLACKFIN_TIMEX_H -#define _ASM_BLACKFIN_TIMEX_H - -#define CLOCK_TICK_RATE 1000000 /* Underlying HZ */ - -typedef unsigned long long cycles_t; - -static inline cycles_t get_cycles(void) -{ - unsigned long tmp, tmp2; - __asm__("%0 = cycles; %1 = cycles2;" : "=d"(tmp), "=d"(tmp2)); - return tmp | ((cycles_t)tmp2 << 32); -} - -#endif |