From 6766b5b1f550a90b750657dbf71c7e886439b82c Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Mon, 16 Mar 2009 20:00:17 +0900 Subject: [PATCH] --- yaml --- r: 133332 b: refs/heads/master c: e9edb3fec2260b5a64e9ca9e09160b74f1b106e3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/cpu/Makefile | 1 + trunk/arch/sh/kernel/cpu/sh4a/Makefile | 4 ---- trunk/arch/sh/kernel/cpu/shmobile/Makefile | 6 ++++++ .../sh/kernel/cpu/{sh4a/pm-sh_mobile.c => shmobile/pm.c} | 0 .../kernel/cpu/{sh4a/sleep-sh_mobile.S => shmobile/sleep.S} | 0 6 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 trunk/arch/sh/kernel/cpu/shmobile/Makefile rename trunk/arch/sh/kernel/cpu/{sh4a/pm-sh_mobile.c => shmobile/pm.c} (100%) rename trunk/arch/sh/kernel/cpu/{sh4a/sleep-sh_mobile.S => shmobile/sleep.S} (100%) diff --git a/[refs] b/[refs] index 5c62a36132ca..b5fb32af48b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2feb075a33905c2f6ef6be484c75ba6a35f6d12d +refs/heads/master: e9edb3fec2260b5a64e9ca9e09160b74f1b106e3 diff --git a/trunk/arch/sh/kernel/cpu/Makefile b/trunk/arch/sh/kernel/cpu/Makefile index f471d242774e..2600641a483f 100644 --- a/trunk/arch/sh/kernel/cpu/Makefile +++ b/trunk/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/trunk/arch/sh/kernel/cpu/sh4a/Makefile b/trunk/arch/sh/kernel/cpu/sh4a/Makefile index 09967dc0065a..1a92361feeb9 100644 --- a/trunk/arch/sh/kernel/cpu/sh4a/Makefile +++ b/trunk/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/trunk/arch/sh/kernel/cpu/shmobile/Makefile b/trunk/arch/sh/kernel/cpu/shmobile/Makefile new file mode 100644 index 000000000000..08bfa7c7db29 --- /dev/null +++ b/trunk/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/trunk/arch/sh/kernel/cpu/sh4a/pm-sh_mobile.c b/trunk/arch/sh/kernel/cpu/shmobile/pm.c similarity index 100% rename from trunk/arch/sh/kernel/cpu/sh4a/pm-sh_mobile.c rename to trunk/arch/sh/kernel/cpu/shmobile/pm.c diff --git a/trunk/arch/sh/kernel/cpu/sh4a/sleep-sh_mobile.S b/trunk/arch/sh/kernel/cpu/shmobile/sleep.S similarity index 100% rename from trunk/arch/sh/kernel/cpu/sh4a/sleep-sh_mobile.S rename to trunk/arch/sh/kernel/cpu/shmobile/sleep.S