diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:19:53 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:19:53 -0400 |
| commit | 064a32d82c20cdcb0119a8b316eb520608d8c647 (patch) | |
| tree | c67d534bd4458b1482c11f11c724fe93beca4f80 /include/asm-v850 | |
| parent | 0327318445d55808991a63137cfb698a90ab6adf (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into x86/memtest
Diffstat (limited to 'include/asm-v850')
| -rw-r--r-- | include/asm-v850/clinkage.h | 2 | ||||
| -rw-r--r-- | include/asm-v850/param.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-v850/clinkage.h b/include/asm-v850/clinkage.h index 2b622adccae5..c389691d6f86 100644 --- a/include/asm-v850/clinkage.h +++ b/include/asm-v850/clinkage.h | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | * Written by Miles Bader <miles@gnu.org> | 11 | * Written by Miles Bader <miles@gnu.org> |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #ifndef __CLINKAGE_H__ | 14 | #ifndef __V850_CLINKAGE_H__ |
| 15 | #define __V850_CLINKAGE_H__ | 15 | #define __V850_CLINKAGE_H__ |
| 16 | 16 | ||
| 17 | #include <asm/macrology.h> | 17 | #include <asm/macrology.h> |
diff --git a/include/asm-v850/param.h b/include/asm-v850/param.h index 281832690290..4391f5fe0204 100644 --- a/include/asm-v850/param.h +++ b/include/asm-v850/param.h | |||
| @@ -26,6 +26,8 @@ | |||
| 26 | # define HZ CONFIG_HZ | 26 | # define HZ CONFIG_HZ |
| 27 | # define USER_HZ 100 | 27 | # define USER_HZ 100 |
| 28 | # define CLOCKS_PER_SEC USER_HZ | 28 | # define CLOCKS_PER_SEC USER_HZ |
| 29 | #else | ||
| 30 | # define HZ 100 | ||
| 29 | #endif | 31 | #endif |
| 30 | 32 | ||
| 31 | #endif /* __V850_PARAM_H__ */ | 33 | #endif /* __V850_PARAM_H__ */ |