Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 235151
b: refs/heads/master
c: cf4fb80
h: refs/heads/master
i:
  235149: 97828e2
  235147: 0f2006b
  235143: e27f889
  235135: 3b2a09b
v: v3
  • Loading branch information
Jan Beulich authored and Rafael J. Wysocki committed Mar 14, 2011
1 parent 3b743f4 commit 3f01e20
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7538e3db6e015e890825fbd9f8659952896ddd5b
refs/heads/master: cf4fb80ca3d591cae366ae8364e3c3f7a68bd249
12 changes: 3 additions & 9 deletions trunk/kernel/power/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -84,18 +84,16 @@ config PM_STD_PARTITION
device.

config PM_SLEEP
bool
def_bool y
depends on SUSPEND || HIBERNATION || XEN_SAVE_RESTORE
default y

config PM_SLEEP_SMP
bool
def_bool y
depends on SMP
depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE
depends on PM_SLEEP
select HOTPLUG
select HOTPLUG_CPU
default y

config PM_RUNTIME
bool "Run-time PM core functionality"
Expand All @@ -112,9 +110,8 @@ config PM_RUNTIME
wake-up events.

config PM
bool
def_bool y
depends on PM_SLEEP || PM_RUNTIME
default y

config PM_DEBUG
bool "Power Management Debug Support"
Expand All @@ -127,14 +124,12 @@ config PM_DEBUG
config PM_VERBOSE
bool "Verbose Power Management debugging"
depends on PM_DEBUG
default n
---help---
This option enables verbose messages from the Power Management code.

config PM_ADVANCED_DEBUG
bool "Extra PM attributes in sysfs for low-level debugging/testing"
depends on PM_DEBUG
default n
---help---
Add extra sysfs attributes allowing one to access some Power Management
fields of device objects from user space. If you are not a kernel
Expand Down Expand Up @@ -175,7 +170,6 @@ config PM_TRACE_RTC
depends on CAN_PM_TRACE
depends on X86
select PM_TRACE
default n
---help---
This enables some cheesy code to save the last PM event point in the
RTC across reboots, so that you can debug a machine that just hangs
Expand Down

0 comments on commit 3f01e20

Please sign in to comment.