diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-03-16 20:00:17 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-03-16 20:00:17 +0900 |
| commit | e9edb3fec2260b5a64e9ca9e09160b74f1b106e3 (patch) | |
| tree | f76071f79bd5fafa833245c0135214d8ad5e8d02 | |
| parent | 2feb075a33905c2f6ef6be484c75ba6a35f6d12d (diff) | |
| download | linux-3.10-e9edb3fec2260b5a64e9ca9e09160b74f1b106e3.tar.gz linux-3.10-e9edb3fec2260b5a64e9ca9e09160b74f1b106e3.tar.bz2 linux-3.10-e9edb3fec2260b5a64e9ca9e09160b74f1b106e3.zip | |
sh: Consolidate SH-Mobile CPU code in arch/sh/kernel/cpu/shmobile/.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | arch/sh/kernel/cpu/Makefile | 1 | ||||
| -rw-r--r-- | arch/sh/kernel/cpu/sh4a/Makefile | 4 | ||||
| -rw-r--r-- | arch/sh/kernel/cpu/shmobile/Makefile | 6 | ||||
| -rw-r--r-- | arch/sh/kernel/cpu/shmobile/pm.c (renamed from arch/sh/kernel/cpu/sh4a/pm-sh_mobile.c) | 0 | ||||
| -rw-r--r-- | arch/sh/kernel/cpu/shmobile/sleep.S (renamed from arch/sh/kernel/cpu/sh4a/sleep-sh_mobile.S) | 0 |
5 files changed, 7 insertions, 4 deletions
diff --git a/arch/sh/kernel/cpu/Makefile b/arch/sh/kernel/cpu/Makefile index f471d242774..2600641a483 100644 --- a/arch/sh/kernel/cpu/Makefile +++ b/arch/sh/kernel/cpu/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_CPU_SH5) = sh5/ # Special cases for family ancestry. obj-$(CONFIG_CPU_SH4A) += sh4a/ +obj-$(CONFIG_ARCH_SHMOBILE) += shmobile/ # Common interfaces. diff --git a/arch/sh/kernel/cpu/sh4a/Makefile b/arch/sh/kernel/cpu/sh4a/Makefile index 09967dc0065..1a92361feeb 100644 --- a/arch/sh/kernel/cpu/sh4a/Makefile +++ b/arch/sh/kernel/cpu/sh4a/Makefile @@ -35,10 +35,6 @@ pinmux-$(CONFIG_CPU_SUBTYPE_SH7723) := pinmux-sh7723.o pinmux-$(CONFIG_CPU_SUBTYPE_SH7785) := pinmux-sh7785.o pinmux-$(CONFIG_CPU_SUBTYPE_SH7786) := pinmux-sh7786.o -# Power Mangement & Sleep mode -pm-$(CONFIG_ARCH_SHMOBILE) := pm-sh_mobile.o sleep-sh_mobile.o - obj-y += $(clock-y) obj-$(CONFIG_SMP) += $(smp-y) obj-$(CONFIG_GENERIC_GPIO) += $(pinmux-y) -obj-$(CONFIG_PM) += $(pm-y) diff --git a/arch/sh/kernel/cpu/shmobile/Makefile b/arch/sh/kernel/cpu/shmobile/Makefile new file mode 100644 index 00000000000..08bfa7c7db2 --- /dev/null +++ b/arch/sh/kernel/cpu/shmobile/Makefile @@ -0,0 +1,6 @@ +# +# Makefile for the Linux/SuperH SH-Mobile backends. +# + +# Power Management & Sleep mode +obj-$(CONFIG_PM) += pm.o sleep.o diff --git a/arch/sh/kernel/cpu/sh4a/pm-sh_mobile.c b/arch/sh/kernel/cpu/shmobile/pm.c index 8c067adf683..8c067adf683 100644 --- a/arch/sh/kernel/cpu/sh4a/pm-sh_mobile.c +++ b/arch/sh/kernel/cpu/shmobile/pm.c diff --git a/arch/sh/kernel/cpu/sh4a/sleep-sh_mobile.S b/arch/sh/kernel/cpu/shmobile/sleep.S index 5d888ef53d8..5d888ef53d8 100644 --- a/arch/sh/kernel/cpu/sh4a/sleep-sh_mobile.S +++ b/arch/sh/kernel/cpu/shmobile/sleep.S |