summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-08-25 15:34:19 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2011-08-25 15:34:19 +0200
commitb5e8d269d814763d597ccc0108d1fa6639ad35a1 (patch)
tree9c401a279d38e977e7208debc74b7ce2708d3498 /drivers
parent4605ab653c1f9d7cc2dda8033de215c9cee325f4 (diff)
PM: Move clock-related definitions and headers to separate file
Since the PM clock management code in drivers/base/power/clock_ops.c is used for both runtime PM and system suspend/hibernation, the definitions of data structures and headers related to it should not be located in include/linux/pm_rumtime.h. Move them to a separate header file. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/base/power/clock_ops.c2
-rw-r--r--drivers/base/power/common.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c
index 8383e2488d7..cb44b58d681 100644
--- a/drivers/base/power/clock_ops.c
+++ b/drivers/base/power/clock_ops.c
@@ -10,7 +10,7 @@
#include <linux/kernel.h>
#include <linux/io.h>
#include <linux/pm.h>
-#include <linux/pm_runtime.h>
+#include <linux/pm_clock.h>
#include <linux/clk.h>
#include <linux/slab.h>
#include <linux/err.h>
diff --git a/drivers/base/power/common.c b/drivers/base/power/common.c
index d398cf029b3..29820c39618 100644
--- a/drivers/base/power/common.c
+++ b/drivers/base/power/common.c
@@ -10,8 +10,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/slab.h>
-#include <linux/device.h>
-#include <linux/pm_runtime.h>
+#include <linux/pm_clock.h>
/**
* dev_pm_get_subsys_data - Create or refcount power.subsys_data for device.