summaryrefslogtreecommitdiffstats
path: root/kernel/power/Makefile
diff options
context:
space:
mode:
authorJean Pihet <jean.pihet@newoldbits.com>2012-02-13 16:23:42 +0100
committerRafael J. Wysocki <rjw@sisk.pl>2012-02-13 16:23:42 +0100
commita9b542ee607a8afafa9447292394959fc84ea650 (patch)
treecac94f0048dbf6475ab5dc2a3b803ab6a59d472a /kernel/power/Makefile
parent654b0c9627bc1b34cc21643afa8ac359c50db7d7 (diff)
downloadop-kernel-dev-a9b542ee607a8afafa9447292394959fc84ea650.zip
op-kernel-dev-a9b542ee607a8afafa9447292394959fc84ea650.tar.gz
PM / QoS: unconditionally build the feature
The PM QoS feature originally didn't depend on CONFIG_PM, which was mistakenly changed by commit e8db0be1245de16a6cc6365506abc392c3c212d4 PM QoS: Move and rename the implementation files Later, commit d020283dc694c9ec31b410f522252f7a8397e67d PM / QoS: CPU C-state breakage with PM Qos change partially fixed that by introducing a static inline definition of pm_qos_request(), but that still didn't allow user space to use the PM QoS interface if CONFIG_PM was unset (which had been possible before). For this reason, remove the dependency of PM QoS on CONFIG_PM to make it work (as intended) with CONFIG_PM unset. [rjw: Replaced the original changelog with a new one.] Signed-off-by: Jean Pihet <j-pihet@ti.com> Reported-by: Venkatesh Pallipadi <venki@google.com> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'kernel/power/Makefile')
-rw-r--r--kernel/power/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/power/Makefile b/kernel/power/Makefile
index 07e0e28..66d808e 100644
--- a/kernel/power/Makefile
+++ b/kernel/power/Makefile
@@ -1,7 +1,8 @@
ccflags-$(CONFIG_PM_DEBUG) := -DDEBUG
-obj-$(CONFIG_PM) += main.o qos.o
+obj-y += qos.o
+obj-$(CONFIG_PM) += main.o
obj-$(CONFIG_VT_CONSOLE_SLEEP) += console.o
obj-$(CONFIG_FREEZER) += process.o
obj-$(CONFIG_SUSPEND) += suspend.o
OpenPOWER on IntegriCloud