diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-07-30 14:37:43 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-07-30 14:37:43 +1000 |
| commit | bdf242eeb0f69567fe43eba93889d80ecacbfe94 (patch) | |
| tree | dc402eeeb75fd51e92b4f4a63712c6e64ac4c2fb /include/asm-cris/timex.h | |
| parent | 836cf0465c422ee6d654060edd7c620d9cf0c09c (diff) | |
| parent | b0825488a642cadcf39709961dde61440cb0731c (diff) | |
| download | blackbird-op-linux-bdf242eeb0f69567fe43eba93889d80ecacbfe94.tar.gz blackbird-op-linux-bdf242eeb0f69567fe43eba93889d80ecacbfe94.zip | |
Merge ../linux-2.6/
Diffstat (limited to 'include/asm-cris/timex.h')
| -rw-r--r-- | include/asm-cris/timex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-cris/timex.h b/include/asm-cris/timex.h index 375c41af47de..3fb069a37717 100644 --- a/include/asm-cris/timex.h +++ b/include/asm-cris/timex.h @@ -14,7 +14,7 @@ * used so it does not matter. */ -typedef unsigned int cycles_t; +typedef unsigned long long cycles_t; extern inline cycles_t get_cycles(void) { |
