diff options
| author | John Rigby <john.rigby@linaro.org> | 2011-02-23 09:15:25 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-03-16 16:05:49 -0600 |
| commit | a287715dfe835019fb8247bf17721d91dd8e02a9 (patch) | |
| tree | a968645d23231ca99e190c0ca368b3e5ae47d69e | |
| parent | 0f03380a6ab269ec7f64b982349ac3278935d296 (diff) | |
LINARO: Enforce CONFIG_PM_ADVANCED_DEBUG
This fixes second half of LP: #713075
Signed-off-by: John Rigby <john.rigby@linaro.org>
| -rw-r--r-- | debian.linaro/changelog | 2 | ||||
| -rw-r--r-- | debian.linaro/config/config.common.ubuntu | 3 | ||||
| -rw-r--r-- | debian.linaro/config/enforce | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/debian.linaro/changelog b/debian.linaro/changelog index ad7e6a25c166..40967140474b 100644 --- a/debian.linaro/changelog +++ b/debian.linaro/changelog @@ -8,6 +8,8 @@ linux-linaro (2.6.38-1000.1) UNRELEASED; urgency=low Linux v2.6.38-rc5 linaro-linux-2.6.38-upstream-22Feb2011 Ubuntu-2.6.38-4.31 + * Enforce CONFIG_PM_ADVANCED_DEBUG for all flavours + - LP: #713075 -- John Rigby <john.rigby@linaro.org> Tue, 22 Feb 2011 12:48:52 -0700 diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu index ccf2729998c3..180b18260371 100644 --- a/debian.linaro/config/config.common.ubuntu +++ b/debian.linaro/config/config.common.ubuntu @@ -1972,12 +1972,13 @@ CONFIG_PLAT_VERSATILE=y CONFIG_PLIP=m CONFIG_PMIC_ADP5520=y CONFIG_PMIC_DA903X=y -# CONFIG_PM_ADVANCED_DEBUG is not set +CONFIG_PM_ADVANCED_DEBUG=y CONFIG_PM_DEBUG=y CONFIG_PM_OPP=y CONFIG_PM_OPS=y CONFIG_PM_RUNTIME=y CONFIG_PM_SLEEP=y +# CONFIG_PM_SLEEP_ADVANCED_DEBUG is not set CONFIG_PM_SLEEP_SMP=y CONFIG_PM_TEST_SUSPEND=y # CONFIG_PM_VERBOSE is not set diff --git a/debian.linaro/config/enforce b/debian.linaro/config/enforce index 7775d618ad1f..c88f65da1752 100644 --- a/debian.linaro/config/enforce +++ b/debian.linaro/config/enforce @@ -78,6 +78,7 @@ value CONFIG_PRINTK_TIME y # CONFIG_PM is broken on s5pv310 so don't enforce CONFIG_PM_DEBUG for the moment value CONFIG_ARCH_S5PV310 y | value CONFIG_PM_DEBUG y +value CONFIG_ARCH_S5PV310 y | value CONFIG_PM_ADVANCED_DEBUG y # LINARO kernels should be able to boot with a BTRFS rootfs without an initrd value CONFIG_BTRFS_FS y |