summaryrefslogtreecommitdiffstats
path: root/arch/m68k/fpsp040
diff options
context:
space:
mode:
authorGreg KH <gregkh@suse.de>2005-09-12 21:10:59 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2005-09-12 21:10:59 +0200
commitad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489 (patch)
tree5571f6a5784f51efddf9c1ee0408894cd63a460f /arch/m68k/fpsp040
parent[PATCH] I2C: i2c-nforce2: drop unused define (diff)
parent[PATCH] x86-64: clean up local_add/sub arguments (diff)
downloadlinux-ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489.tar.xz
linux-ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489.zip
Merge ../torvalds-2.6/
Diffstat (limited to 'arch/m68k/fpsp040')
-rw-r--r--arch/m68k/fpsp040/skeleton.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/fpsp040/skeleton.S b/arch/m68k/fpsp040/skeleton.S
index dbc1255a5e99..9571a21d6ad4 100644
--- a/arch/m68k/fpsp040/skeleton.S
+++ b/arch/m68k/fpsp040/skeleton.S
@@ -40,7 +40,7 @@
#include <linux/linkage.h>
#include <asm/entry.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
|SKELETON idnt 2,1 | Motorola 040 Floating Point Software Package