diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-19 14:53:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-19 14:53:06 -0400 |
| commit | 8b22c249e7de453961e4d253b19fc2a0bdd65d53 (patch) | |
| tree | df4be07322c1bee5aa47e283a15377843ca2b05e /include/asm-arm/system.h | |
| parent | 7df551254add79a445d2e47e8f849cef8fee6e38 (diff) | |
| parent | ea4423c3b6c1dbd116c91be876b3ad07067c77c8 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
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__( \ |