diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-22 02:51:34 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-22 02:51:34 -0400 |
| commit | 985990137e81ca9fd6561cd0f7d1a9695ec57d5a (patch) | |
| tree | 7a67493285623a7356ba7065cada6728993d1a3b /include/asm-powerpc | |
| parent | 834289447542b7ec55c0847486616d4d53ddf891 (diff) | |
| parent | 63172cb3d5ef762dcb60a292bc7f016b85cf6e1f (diff) | |
Merge changes from linux-2.6 by hand
Diffstat (limited to 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/cputable.h | 1 | ||||
| -rw-r--r-- | include/asm-powerpc/timex.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-powerpc/cputable.h b/include/asm-powerpc/cputable.h index 373642aff7d8..c019501daceb 100644 --- a/include/asm-powerpc/cputable.h +++ b/include/asm-powerpc/cputable.h | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #define PPC_FEATURE_HAS_SPE 0x00800000 | 15 | #define PPC_FEATURE_HAS_SPE 0x00800000 |
| 16 | #define PPC_FEATURE_HAS_EFP_SINGLE 0x00400000 | 16 | #define PPC_FEATURE_HAS_EFP_SINGLE 0x00400000 |
| 17 | #define PPC_FEATURE_HAS_EFP_DOUBLE 0x00200000 | 17 | #define PPC_FEATURE_HAS_EFP_DOUBLE 0x00200000 |
| 18 | #define PPC_FEATURE_NO_TB 0x00100000 | ||
| 18 | 19 | ||
| 19 | #ifdef __KERNEL__ | 20 | #ifdef __KERNEL__ |
| 20 | #ifndef __ASSEMBLY__ | 21 | #ifndef __ASSEMBLY__ |
diff --git a/include/asm-powerpc/timex.h b/include/asm-powerpc/timex.h index 51c5b316be55..c02d15aced91 100644 --- a/include/asm-powerpc/timex.h +++ b/include/asm-powerpc/timex.h | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | #include <linux/config.h> | 10 | #include <linux/config.h> |
| 11 | #include <asm/cputable.h> | 11 | #include <asm/cputable.h> |
| 12 | 12 | ||
| 13 | #define CLOCK_TICK_RATE 1193180 /* Underlying HZ */ | 13 | #define CLOCK_TICK_RATE 1024000 /* Underlying HZ */ |
| 14 | 14 | ||
| 15 | typedef unsigned long cycles_t; | 15 | typedef unsigned long cycles_t; |
| 16 | 16 | ||