diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 18:46:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 18:46:49 -0400 |
| commit | 486a153f0e294f7cc735838edcb6b32e623cbe52 (patch) | |
| tree | f16a31eb3526968dd08aa93c12cbb211f31f2084 /arch/parisc/kernel/process.c | |
| parent | 9c8550ee25e26d14a8f0fe1b761a676e23fe3cf0 (diff) | |
| parent | f64a227b6b5cc1f8cc7f6ef9cc3351343636bac9 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'arch/parisc/kernel/process.c')
| -rw-r--r-- | arch/parisc/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c index 4fc04501d5e5..46b759385115 100644 --- a/arch/parisc/kernel/process.c +++ b/arch/parisc/kernel/process.c | |||
| @@ -47,7 +47,7 @@ | |||
| 47 | #include <linux/kallsyms.h> | 47 | #include <linux/kallsyms.h> |
| 48 | 48 | ||
| 49 | #include <asm/io.h> | 49 | #include <asm/io.h> |
| 50 | #include <asm/offsets.h> | 50 | #include <asm/asm-offsets.h> |
| 51 | #include <asm/pdc.h> | 51 | #include <asm/pdc.h> |
| 52 | #include <asm/pdc_chassis.h> | 52 | #include <asm/pdc_chassis.h> |
| 53 | #include <asm/pgalloc.h> | 53 | #include <asm/pgalloc.h> |