diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /arch/parisc/kernel/process.c | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
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> |