diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 14:59:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-01 14:59:11 -0700 |
| commit | 2b12a4c524812fb3f6ee590a02e65b95c8c32229 (patch) | |
| tree | 6d319a371c56798d2d5c3ad21801eba142a1c77e /arch/ia64/kernel/asm-offsets.c | |
| parent | 4744b43431e8613f920c5cba88346756f53c5165 (diff) | |
| parent | 7f30491ccd28627742e37899453ae20e3da8e18f (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Move include/asm-ia64 to arch/ia64/include/asm
Diffstat (limited to 'arch/ia64/kernel/asm-offsets.c')
| -rw-r--r-- | arch/ia64/kernel/asm-offsets.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/ia64/kernel/asm-offsets.c b/arch/ia64/kernel/asm-offsets.c index c64a55af9b9..94c44b1ccfd 100644 --- a/arch/ia64/kernel/asm-offsets.c +++ b/arch/ia64/kernel/asm-offsets.c @@ -10,11 +10,11 @@ #include <linux/pid.h> #include <linux/clocksource.h> #include <linux/kbuild.h> -#include <asm-ia64/processor.h> -#include <asm-ia64/ptrace.h> -#include <asm-ia64/siginfo.h> -#include <asm-ia64/sigcontext.h> -#include <asm-ia64/mca.h> +#include <asm/processor.h> +#include <asm/ptrace.h> +#include <asm/siginfo.h> +#include <asm/sigcontext.h> +#include <asm/mca.h> #include "../kernel/sigframe.h" #include "../kernel/fsyscall_gtod_data.h" |