diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-15 11:00:05 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-15 11:00:05 -0700 |
commit | 0de19a456cb59106420864927fdec152310f70b6 (patch) | |
tree | f83c05aa493720736a329afad301251a087cc5b2 /arch/sh/boot/compressed/head_64.S | |
parent | abe2f41430770270a1512bf78f489284bfbdbd04 (diff) | |
parent | fd785d6b18b930b76ad5076eed6e9af43195b281 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25:
sh: export empty_zero_page
sh: arch/sh/kernel/traps_32.c needs asm/fpu.h
sh: fix compressed kernel build
sh64: add missing #include <asm/fpu.h>'s
Diffstat (limited to 'arch/sh/boot/compressed/head_64.S')
-rw-r--r-- | arch/sh/boot/compressed/head_64.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/boot/compressed/head_64.S b/arch/sh/boot/compressed/head_64.S index 1d4ecbfc767..f72c1989f5f 100644 --- a/arch/sh/boot/compressed/head_64.S +++ b/arch/sh/boot/compressed/head_64.S @@ -13,7 +13,6 @@ * Modification for compressed loader: * Copyright (C) 2002 Stuart Menefy (stuart.menefy@st.com) */ -#include <linux/linkage.h> #include <asm/cache.h> #include <asm/cpu/mmu_context.h> #include <asm/cpu/registers.h> |