diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
| commit | ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489 (patch) | |
| tree | 5571f6a5784f51efddf9c1ee0408894cd63a460f /arch/ppc64/kernel/cpu_setup_power4.S | |
| parent | 6b7839007098a6b5612d31690e11277d4242e6ae (diff) | |
| parent | 2ade81473636b33aaac64495f89a7dc572c529f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'arch/ppc64/kernel/cpu_setup_power4.S')
| -rw-r--r-- | arch/ppc64/kernel/cpu_setup_power4.S | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ppc64/kernel/cpu_setup_power4.S b/arch/ppc64/kernel/cpu_setup_power4.S index 0482c063c26e..1fb673c511ff 100644 --- a/arch/ppc64/kernel/cpu_setup_power4.S +++ b/arch/ppc64/kernel/cpu_setup_power4.S | |||
| @@ -12,10 +12,9 @@ | |||
| 12 | #include <linux/config.h> | 12 | #include <linux/config.h> |
| 13 | #include <asm/processor.h> | 13 | #include <asm/processor.h> |
| 14 | #include <asm/page.h> | 14 | #include <asm/page.h> |
| 15 | #include <asm/ppc_asm.h> | ||
| 16 | #include <asm/cputable.h> | 15 | #include <asm/cputable.h> |
| 17 | #include <asm/ppc_asm.h> | 16 | #include <asm/ppc_asm.h> |
| 18 | #include <asm/offsets.h> | 17 | #include <asm/asm-offsets.h> |
| 19 | #include <asm/cache.h> | 18 | #include <asm/cache.h> |
| 20 | 19 | ||
| 21 | _GLOBAL(__970_cpu_preinit) | 20 | _GLOBAL(__970_cpu_preinit) |