diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-10 00:46:49 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-10 00:46:49 +0200 |
commit | 486a153f0e294f7cc735838edcb6b32e623cbe52 (patch) | |
tree | f16a31eb3526968dd08aa93c12cbb211f31f2084 /arch/arm/vfp/entry.S | |
parent | Remove "must_check" attributes in PCI-land (diff) | |
parent | kbuild: um fix so it compile with generic asm-offsets.h support (diff) | |
download | linux-486a153f0e294f7cc735838edcb6b32e623cbe52.tar.xz linux-486a153f0e294f7cc735838edcb6b32e623cbe52.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'arch/arm/vfp/entry.S')
-rw-r--r-- | arch/arm/vfp/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/vfp/entry.S b/arch/arm/vfp/entry.S index e73c8deca592..6f17187ab32a 100644 --- a/arch/arm/vfp/entry.S +++ b/arch/arm/vfp/entry.S @@ -17,7 +17,7 @@ */ #include <linux/linkage.h> #include <linux/init.h> -#include <asm/constants.h> +#include <asm/asm-offsets.h> #include <asm/vfpmacros.h> .globl do_vfp |