---

yaml --- r: 283599 b: refs/heads/master c: 62d3ba8 h: refs/heads/master i: 283597: 62e720f 283595: 34157ca 283591: 952818c 283583: 51e92da v: v3
git-mirror · Nov 18, 2011 · a4d104f · a4d104f
1 parent 72e0a07
commit a4d104f
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 343 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fa4632db8bfadf37b5e19f6b73398c6bccb5c90
+refs/heads/master: 62d3ba8bba6fb1d1362dcaa1da2679f4ab740226
diff --git a/trunk/arch/sh/include/asm/device.h b/trunk/arch/sh/include/asm/device.h
@@ -14,15 +14,6 @@ int platform_resource_setup_memory(struct platform_device *pdev,
 
 void plat_early_device_setup(void);
 
-#define PDEV_ARCHDATA_FLAG_INIT 0
-#define PDEV_ARCHDATA_FLAG_IDLE 1
-#define PDEV_ARCHDATA_FLAG_SUSP 2
-
 struct pdev_archdata {
 	int hwblk_id;
-#ifdef CONFIG_PM_RUNTIME
-	unsigned long flags;
-	struct list_head entry;
-	struct mutex mutex;
-#endif
 };
diff --git a/trunk/arch/sh/kernel/cpu/shmobile/Makefile b/trunk/arch/sh/kernel/cpu/shmobile/Makefile
@@ -5,6 +5,3 @@
 # Power Management & Sleep mode
 obj-$(CONFIG_PM)	+= pm.o sleep.o
 obj-$(CONFIG_CPU_IDLE)	+= cpuidle.o
-ifneq ($(CONFIG_CPU_SUBTYPE_SH7722)$(CONFIG_CPU_SUBTYPE_SH7723)$(CONFIG_CPU_SUBTYPE_SH7724),y)
-obj-$(CONFIG_PM_RUNTIME)	+= pm_runtime.o
-endif
diff --git a/trunk/arch/sh/kernel/cpu/shmobile/pm_runtime.c b/trunk/arch/sh/kernel/cpu/shmobile/pm_runtime.c
diff --git a/trunk/drivers/sh/Makefile b/trunk/drivers/sh/Makefile
@@ -7,14 +7,4 @@ obj-$(CONFIG_HAVE_CLK)		+= clk/
 obj-$(CONFIG_MAPLE)		+= maple/
 obj-$(CONFIG_SUPERHYWAY)	+= superhyway/
 obj-$(CONFIG_GENERIC_GPIO)	+= pfc.o
-
-#
-# For the moment we only use this framework for ARM-based SH/R-Mobile
-# platforms and generic SH. SH-based SH-Mobile platforms are still using
-# an older framework that is pending up-porting, at which point this
-# special casing can go away.
-#
-obj-$(CONFIG_SUPERH)$(CONFIG_ARCH_SHMOBILE)	+= pm_runtime.o
-obj-$(CONFIG_CPU_SUBTYPE_SH7722)		+= pm_runtime.o
-obj-$(CONFIG_CPU_SUBTYPE_SH7723)		+= pm_runtime.o
-obj-$(CONFIG_CPU_SUBTYPE_SH7724)		+= pm_runtime.o
+obj-$(CONFIG_PM_RUNTIME)	+= pm_runtime.o