diff options
| author | Linus Torvalds | 2005-09-10 00:46:49 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-09-10 00:46:49 +0200 |
| commit | 486a153f0e294f7cc735838edcb6b32e623cbe52 (patch) | |
| tree | f16a31eb3526968dd08aa93c12cbb211f31f2084 /arch/ppc/kernel/cpu_setup_6xx.S | |
| parent | Remove "must_check" attributes in PCI-land (diff) | |
| parent | kbuild: um fix so it compile with generic asm-offsets.h support (diff) | |
| download | kernel-qcow2-linux-486a153f0e294f7cc735838edcb6b32e623cbe52.tar.gz kernel-qcow2-linux-486a153f0e294f7cc735838edcb6b32e623cbe52.tar.xz kernel-qcow2-linux-486a153f0e294f7cc735838edcb6b32e623cbe52.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'arch/ppc/kernel/cpu_setup_6xx.S')
| -rw-r--r-- | arch/ppc/kernel/cpu_setup_6xx.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/kernel/cpu_setup_6xx.S b/arch/ppc/kernel/cpu_setup_6xx.S index bd037caa4055..1f37b7eafac2 100644 --- a/arch/ppc/kernel/cpu_setup_6xx.S +++ b/arch/ppc/kernel/cpu_setup_6xx.S @@ -15,7 +15,7 @@ #include <asm/ppc_asm.h> #include <asm/cputable.h> #include <asm/ppc_asm.h> -#include <asm/offsets.h> +#include <asm/asm-offsets.h> #include <asm/cache.h> _GLOBAL(__setup_cpu_601) |