diff --git a/debian/changelog b/debian/changelog index b809dae5b..ed24d6fd2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -249,6 +249,8 @@ linux (4.0.2-1~exp1) UNRELEASED; urgency=medium * [armel/kirkwood] sound: Enable SND_SIMPLE_CARD as module, replacing SND_KIRKWOOD_SOC_OPENRD, SND_KIRKWOOD_SOC_T5325; re-enable SND_SOC_ALC5623, SND_SOC_CS42L51_I2C as modules + * [alpha,armel/kirkwood,hppa,ia64,mips*/{octeon,sb1-bcm91250a}] Re-enable PM + * [armel/orion5x] Enable PM [ Ian Campbell ] * [armhf] Enable support for Freescale SNVS RTC. (Closes: #782364) diff --git a/debian/config/config b/debian/config/config index 3e4c8ac27..2ba02ad5a 100644 --- a/debian/config/config +++ b/debian/config/config @@ -5199,6 +5199,7 @@ CONFIG_HZ_250=y ## ## file: kernel/power/Kconfig ## +CONFIG_PM=y CONFIG_SUSPEND=y CONFIG_HIBERNATION=y CONFIG_PM_STD_PARTITION=""