diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 08:14:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 08:14:53 -0800 |
| commit | c8940eca75e6d1ea57f6c491a30bd1023c64c9ad (patch) | |
| tree | d68944ab9fa8ba3c77b18edc2bd836c7e355b23e /kernel/power/Makefile | |
| parent | 78c92a9fd4b6abbbc1fe1ec335c697cb4e63f252 (diff) | |
| parent | 3ae22e8c8ac39daf88ae32f047fb23825be7c646 (diff) | |
| download | blackbird-op-linux-c8940eca75e6d1ea57f6c491a30bd1023c64c9ad.tar.gz blackbird-op-linux-c8940eca75e6d1ea57f6c491a30bd1023c64c9ad.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
spi / PM: Support dev_pm_ops
PM: Prototype the pm_generic_ operations
PM / Runtime: Generic resume shouldn't set RPM_ACTIVE unconditionally
PM: Use dev_name() in core device suspend and resume routines
PM: Permit registration of parentless devices during system suspend
PM: Replace the device power.status field with a bit field
PM: Remove redundant checks from core device resume routines
PM: Use a different list of devices for each stage of device suspend
PM: Avoid compiler warning in pm_noirq_op()
PM: Use pm_wakeup_pending() in __device_suspend()
PM / Wakeup: Replace pm_check_wakeup_events() with pm_wakeup_pending()
PM: Prevent dpm_prepare() from returning errors unnecessarily
PM: Fix references to basic-pm-debugging.txt in drivers-testing.txt
PM / Runtime: Add synchronous runtime interface for interrupt handlers (v3)
PM / Hibernate: When failed, in_suspend should be reset
PM / Hibernate: hibernation_ops->leave should be checked too
Freezer: Fix a race during freezing of TASK_STOPPED tasks
PM: Use proper ccflag flag in kernel/power/Makefile
PM / Runtime: Fix comments to match runtime callback code
Diffstat (limited to 'kernel/power/Makefile')
| -rw-r--r-- | kernel/power/Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/power/Makefile b/kernel/power/Makefile index f9063c6b185d..b75597235d85 100644 --- a/kernel/power/Makefile +++ b/kernel/power/Makefile @@ -1,7 +1,4 @@ - -ifeq ($(CONFIG_PM_DEBUG),y) -EXTRA_CFLAGS += -DDEBUG -endif +ccflags-$(CONFIG_PM_DEBUG) := -DDEBUG obj-$(CONFIG_PM) += main.o obj-$(CONFIG_PM_SLEEP) += console.o |
