Merge tag 'vfio-v3.15-rc1' of git://github.com/awilliam/linux-vfio

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / Kconfig

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 07aa3556952cd773adf64d1ff8d2e2a63f8e3faa..9711a5fd948d126f3c457d1edc7ac720bd3c63b4 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -47,6 +47,7 @@ config ARM64
        select NO_BOOTMEM
        select OF
        select OF_EARLY_FLATTREE
+       select OF_RESERVED_MEM
        select PERF_USE_VMALLOC
        select POWER_RESET
        select POWER_SUPPLY
@@ -321,12 +322,6 @@ menu "CPU Power Management"
 
 source "drivers/cpuidle/Kconfig"
 
-source "drivers/cpufreq/Kconfig"
-
-endmenu
-
-menu "Power management options"
-
 source "kernel/power/Kconfig"
 
 source "drivers/cpufreq/Kconfig"