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/sparc/mm/viking.S | |
| 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/sparc/mm/viking.S')
| -rw-r--r-- | arch/sparc/mm/viking.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/mm/viking.S b/arch/sparc/mm/viking.S index f58712d26bf5..3cbd6de18dde 100644 --- a/arch/sparc/mm/viking.S +++ b/arch/sparc/mm/viking.S @@ -9,7 +9,7 @@ #include <linux/config.h> #include <asm/ptrace.h> #include <asm/psr.h> -#include <asm/asm_offsets.h> +#include <asm/asm-offsets.h> #include <asm/asi.h> #include <asm/mxcc.h> #include <asm/page.h> |