diff options
| author | Manuel Lauss <mano@roarinelk.homelinux.net> | 2008-04-15 13:01:55 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-04-15 13:01:55 -0400 |
| commit | 85eee6072bae69acfab903df596b5f468df03470 (patch) | |
| tree | a48e0663fcee20e64127f6289eeccc2042b32976 | |
| parent | 50387b3e11075fe798f5d44fa1b5491788a8742a (diff) | |
sh: fix compressed kernel build
commit 54a015104136974262afa4b8ddd943ea70dec8a2 broke zImage build on sh arch:
LD vmlinux
SYSMAP System.map
SYSMAP .tmp_System.map
AS arch/sh/boot/compressed/head_32.o
In file included from /k/arch/sh/boot/compressed/head_32.S:11:
/k/include/linux/linkage.h:34: error: syntax error in macro parameter list
Fix it for both sh and sh64.
Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | arch/sh/boot/compressed/head_32.S | 1 | ||||
| -rw-r--r-- | arch/sh/boot/compressed/head_64.S | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/sh/boot/compressed/head_32.S b/arch/sh/boot/compressed/head_32.S index a8399b013729..06ac31f3be88 100644 --- a/arch/sh/boot/compressed/head_32.S +++ b/arch/sh/boot/compressed/head_32.S | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | 7 | ||
| 8 | .text | 8 | .text |
| 9 | 9 | ||
| 10 | #include <linux/linkage.h> | ||
| 11 | #include <asm/page.h> | 10 | #include <asm/page.h> |
| 12 | 11 | ||
| 13 | .global startup | 12 | .global startup |
diff --git a/arch/sh/boot/compressed/head_64.S b/arch/sh/boot/compressed/head_64.S index 1d4ecbfc767c..f72c1989f5f2 100644 --- a/arch/sh/boot/compressed/head_64.S +++ b/arch/sh/boot/compressed/head_64.S | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | * Modification for compressed loader: | 13 | * Modification for compressed loader: |
| 14 | * Copyright (C) 2002 Stuart Menefy (stuart.menefy@st.com) | 14 | * Copyright (C) 2002 Stuart Menefy (stuart.menefy@st.com) |
| 15 | */ | 15 | */ |
| 16 | #include <linux/linkage.h> | ||
| 17 | #include <asm/cache.h> | 16 | #include <asm/cache.h> |
| 18 | #include <asm/cpu/mmu_context.h> | 17 | #include <asm/cpu/mmu_context.h> |
| 19 | #include <asm/cpu/registers.h> | 18 | #include <asm/cpu/registers.h> |
