archr/Arch-R
0
0
Fork 0
mirror of https://github.com/archr-linux/Arch-R.git synced 2026-03-31 14:41:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into openelec-systemd

Browse Source 
Conflicts:
	projects/ARCTIC_MC/linux/linux.x86_64.conf
	projects/ATV/linux/linux.i386.conf
	projects/Fusion/linux/linux.i386.conf
	projects/Fusion/linux/linux.x86_64.conf
	projects/Generic/linux/linux.i386.conf
	projects/Generic/linux/linux.x86_64.conf
	projects/Generic_OSS/linux/linux.i386.conf
	projects/ION/linux/linux.x86_64.conf
	projects/Intel/linux/linux.x86_64.conf
	projects/Virtual/linux/linux.i386.conf
	projects/Virtual/linux/linux.x86_64.conf
This commit is contained in:
Stefan Saraev
2013-09-07 22:22:08 +03:00
parent 1993e615de 11013c2bee
commit 9c6e9af0f1
13 changed files with 3866 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
projects/Generic/linux/linux.i386.conf
View File

@@ -471,7 +471,11 @@ CONFIG_PM_SLEEP_SMP=y
# CONFIG_PM_WAKELOCKS is not set
CONFIG_PM_RUNTIME=y
CONFIG_PM=y
# CONFIG_PM_DEBUG is not set
CONFIG_PM_DEBUG=y
# CONFIG_PM_ADVANCED_DEBUG is not set
CONFIG_PM_TEST_SUSPEND=y
CONFIG_PM_SLEEP_DEBUG=y
# CONFIG_PM_TRACE_RTC is not set
CONFIG_PM_CLK=y
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_ACPI=y
@@ -527,8 +531,8 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
#
# x86 CPU frequency scaling drivers
#
# CONFIG_X86_INTEL_PSTATE is not set
# CONFIG_X86_PCC_CPUFREQ is not set
CONFIG_X86_INTEL_PSTATE=y
CONFIG_X86_PCC_CPUFREQ=m
CONFIG_X86_ACPI_CPUFREQ=y
CONFIG_X86_ACPI_CPUFREQ_CPB=y
# CONFIG_X86_POWERNOW_K6 is not set

10
projects/Generic/linux/linux.x86_64.conf
View File

@@ -461,7 +461,11 @@ CONFIG_PM_SLEEP_SMP=y
# CONFIG_PM_WAKELOCKS is not set
CONFIG_PM_RUNTIME=y
CONFIG_PM=y
# CONFIG_PM_DEBUG is not set
CONFIG_PM_DEBUG=y
# CONFIG_PM_ADVANCED_DEBUG is not set
CONFIG_PM_TEST_SUSPEND=y
CONFIG_PM_SLEEP_DEBUG=y
# CONFIG_PM_TRACE_RTC is not set
CONFIG_PM_CLK=y
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
CONFIG_ACPI=y
@@ -517,8 +521,8 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
#
# x86 CPU frequency scaling drivers
#
# CONFIG_X86_INTEL_PSTATE is not set
# CONFIG_X86_PCC_CPUFREQ is not set
CONFIG_X86_INTEL_PSTATE=y
CONFIG_X86_PCC_CPUFREQ=m
CONFIG_X86_ACPI_CPUFREQ=y
CONFIG_X86_ACPI_CPUFREQ_CPB=y
CONFIG_X86_POWERNOW_K8=y