diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
| commit | 8ba08378b479f472b37b83542c31bdad465033cf (patch) | |
| tree | f4421227b3065e786c9041cf0ce0073a249e011b /include/asm-arm/system.h | |
| parent | 34b727c135ff651f153be5757056d25678b6d018 (diff) | |
| parent | 8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'include/asm-arm/system.h')
| -rw-r--r-- | include/asm-arm/system.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h index b13a8da4847b..8405eb6558ed 100644 --- a/include/asm-arm/system.h +++ b/include/asm-arm/system.h | |||
| @@ -104,6 +104,7 @@ extern void show_pte(struct mm_struct *mm, unsigned long addr); | |||
| 104 | extern void __show_regs(struct pt_regs *); | 104 | extern void __show_regs(struct pt_regs *); |
| 105 | 105 | ||
| 106 | extern int cpu_architecture(void); | 106 | extern int cpu_architecture(void); |
| 107 | extern void cpu_init(void); | ||
| 107 | 108 | ||
| 108 | #define set_cr(x) \ | 109 | #define set_cr(x) \ |
| 109 | __asm__ __volatile__( \ | 110 | __asm__ __volatile__( \ |