mirror of
https://github.com/torvalds/linux.git
synced 2026-06-10 07:32:29 +02:00
Merge remote-tracking branch 'lsk/v3.10/topic/cpufreq' into linux-linaro-lsk
This commit is contained in:
commit
b63a387854
|
|
@ -229,6 +229,14 @@ config SYSVIPC_COMPAT
|
|||
|
||||
endmenu
|
||||
|
||||
menu "Power management options"
|
||||
|
||||
source "kernel/power/Kconfig"
|
||||
|
||||
source "drivers/cpufreq/Kconfig"
|
||||
|
||||
endmenu
|
||||
|
||||
source "net/Kconfig"
|
||||
|
||||
source "drivers/Kconfig"
|
||||
|
|
|
|||
|
|
@ -201,7 +201,7 @@ source "drivers/cpufreq/Kconfig.x86"
|
|||
endmenu
|
||||
|
||||
menu "ARM CPU frequency scaling drivers"
|
||||
depends on ARM
|
||||
depends on ARM || ARM64
|
||||
source "drivers/cpufreq/Kconfig.arm"
|
||||
endmenu
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user