sh: Consolidate SH-Mobile CPU code in arch/sh/kernel/cpu/shmobile/.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
git-mirror · Mar 16, 2009 · e9edb3f · e9edb3f
1 parent 2feb075
commit e9edb3f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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 → arch/sh/kernel/cpu/shmobile/pm.c b/arch/sh/kernel/cpu/sh4a/pm-sh_mobile.c → arch/sh/kernel/cpu/shmobile/pm.c
diff --git a/arch/sh/kernel/cpu/sh4a/sleep-sh_mobile.S → arch/sh/kernel/cpu/shmobile/sleep.S b/arch/sh/kernel/cpu/sh4a/sleep-sh_mobile.S → arch/sh/kernel/cpu/shmobile/sleep.S