diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-11-11 09:11:18 (GMT) |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-01-28 04:18:46 (GMT) |
| commit | 343ac72248d360f1fae72176aca1117be19189ec (patch) | |
| tree | f9f100f3e16aea8986e5054a4da26d69ecd954ca /arch | |
| parent | 49e6c3e7460a718242dc11b801811f0ac6892154 (diff) | |
| download | linux-fsl-qoriq-343ac72248d360f1fae72176aca1117be19189ec.tar.xz | |
sh: Move over the SH-5 entry.S.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh/kernel/cpu/Makefile | 6 | ||||
| -rw-r--r-- | arch/sh/kernel/cpu/sh5/Makefile | 1 | ||||
| -rw-r--r-- | arch/sh/kernel/cpu/sh5/entry.S (renamed from arch/sh64/kernel/entry.S) | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/arch/sh/kernel/cpu/Makefile b/arch/sh/kernel/cpu/Makefile index d055a3e..f471d24 100644 --- a/arch/sh/kernel/cpu/Makefile +++ b/arch/sh/kernel/cpu/Makefile @@ -6,8 +6,14 @@ obj-$(CONFIG_CPU_SH2) = sh2/ obj-$(CONFIG_CPU_SH2A) = sh2a/ obj-$(CONFIG_CPU_SH3) = sh3/ obj-$(CONFIG_CPU_SH4) = sh4/ +obj-$(CONFIG_CPU_SH5) = sh5/ + +# Special cases for family ancestry. + obj-$(CONFIG_CPU_SH4A) += sh4a/ +# Common interfaces. + obj-$(CONFIG_UBC_WAKEUP) += ubc.o obj-$(CONFIG_SH_ADC) += adc.o diff --git a/arch/sh/kernel/cpu/sh5/Makefile b/arch/sh/kernel/cpu/sh5/Makefile new file mode 100644 index 0000000..9778f9b --- /dev/null +++ b/arch/sh/kernel/cpu/sh5/Makefile @@ -0,0 +1 @@ +obj-y := entry.o diff --git a/arch/sh64/kernel/entry.S b/arch/sh/kernel/cpu/sh5/entry.S index 7013fcb..2f505a7 100644 --- a/arch/sh64/kernel/entry.S +++ b/arch/sh/kernel/cpu/sh5/entry.S @@ -10,12 +10,10 @@ * Copyright (C) 2003, 2004 Richard Curnow * */ - #include <linux/errno.h> #include <linux/sys.h> - +#include <asm/cpu/registers.h> #include <asm/processor.h> -#include <asm/registers.h> #include <asm/unistd.h> #include <asm/thread_info.h> #include <asm/asm-offsets.h> |