diff options
author | Greg KH <gregkh@suse.de> | 2005-09-12 21:10:59 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 21:10:59 +0200 |
commit | ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489 (patch) | |
tree | 5571f6a5784f51efddf9c1ee0408894cd63a460f /arch/parisc/kernel/ptrace.c | |
parent | [PATCH] I2C: i2c-nforce2: drop unused define (diff) | |
parent | [PATCH] x86-64: clean up local_add/sub arguments (diff) | |
download | linux-ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489.tar.xz linux-ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489.zip |
Merge ../torvalds-2.6/
Diffstat (limited to 'arch/parisc/kernel/ptrace.c')
-rw-r--r-- | arch/parisc/kernel/ptrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/ptrace.c b/arch/parisc/kernel/ptrace.c index c07db9dff7cd..f3428e5e86fb 100644 --- a/arch/parisc/kernel/ptrace.c +++ b/arch/parisc/kernel/ptrace.c @@ -23,7 +23,7 @@ #include <asm/pgtable.h> #include <asm/system.h> #include <asm/processor.h> -#include <asm/offsets.h> +#include <asm/asm-offsets.h> /* PSW bits we allow the debugger to modify */ #define USER_PSW_BITS (PSW_N | PSW_V | PSW_CB) |