From 8904b7659a3fff94637af328dae415110b6f46d7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 1 Aug 2015 10:41:19 +0200 Subject: update to 4.1.3, which will be the base for stable branch --- target/linux/config/Config.in.pm | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'target/linux/config/Config.in.pm') diff --git a/target/linux/config/Config.in.pm b/target/linux/config/Config.in.pm index 0e418ce0c..e7c875047 100644 --- a/target/linux/config/Config.in.pm +++ b/target/linux/config/Config.in.pm @@ -1,34 +1,39 @@ +config ADK_KERNEL_PM + bool + default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 + config ADK_KERNEL_PM_RUNTIME - boolean + bool default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 config ADK_KERNEL_ACPI - boolean + bool config ADK_KERNEL_ACPI_SYSFS_POWER - boolean + bool config ADK_KERNEL_ACPI_AC - boolean + bool config ADK_KERNEL_ACPI_BATTERY - boolean + bool config ADK_KERNEL_ACPI_BUTTON - boolean + bool config ADK_KERNEL_ACPI_FAN - boolean + bool config ADK_KERNEL_ACPI_DOCK - boolean + bool menu "Power Management support" depends on ADK_TARGET_WITH_ACPI || ADK_TARGET_SYSTEM_LEMOTE_YEELONG config ADK_HARDWARE_ACPI prompt "Enable ACPI support" - boolean + bool + select ADK_KERNEL_PM select ADK_KERNEL_PM_RUNTIME select ADK_KERNEL_ACPI select ADK_KERNEL_ACPI_SYSFS_POWER @@ -45,7 +50,8 @@ config ADK_HARDWARE_ACPI config ADK_KERNEL_SUSPEND prompt "Enable Suspend-to-RAM support" - boolean + bool + select ADK_KERNEL_PM select ADK_KERNEL_PM_RUNTIME default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG @@ -55,7 +61,8 @@ config ADK_KERNEL_SUSPEND config ADK_KERNEL_HIBERNATION prompt "Enable Suspend-to-Disk support" - boolean + bool + select ADK_KERNEL_PM select ADK_KERNEL_PM_RUNTIME select ADK_KERNEL_SWAP select BUSYBOX_SWAPONOFF -- cgit v1.2.3