diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-10 03:14:47 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-10 03:14:47 +0200 |
| commit | d344c5e0856ad03278d8700b503762dbc8b86e12 (patch) | |
| tree | a6d893a643470a3c2580a58f3228a55fa1fd1d82 /arch/arm/kernel/entry-header.S | |
| parent | Input: HIDDEV - make HIDIOCSREPORT wait IO completion (diff) | |
| parent | [PATCH] md: fix BUG when raid10 rebuilds without enough drives (diff) | |
| download | linux-d344c5e0856ad03278d8700b503762dbc8b86e12.tar.xz linux-d344c5e0856ad03278d8700b503762dbc8b86e12.zip | |
Manual merge with Linus
Diffstat (limited to 'arch/arm/kernel/entry-header.S')
| -rw-r--r-- | arch/arm/kernel/entry-header.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S index afef21273963..648cfff93138 100644 --- a/arch/arm/kernel/entry-header.S +++ b/arch/arm/kernel/entry-header.S @@ -3,7 +3,7 @@ #include <linux/linkage.h> #include <asm/assembler.h> -#include <asm/constants.h> +#include <asm/asm-offsets.h> #include <asm/errno.h> #include <asm/thread_info.h> |