diff options
| author | Jon Medhurst <tixy@linaro.org> | 2014-04-07 10:30:36 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2014-04-07 10:30:36 +0100 |
| commit | fe96e22a61854f4e502faa47160e41ea47e2dc31 (patch) | |
| tree | 854fa9f9b5c1488cd1b1e0536cdece74ad9901e0 /drivers/cpufreq/Kconfig | |
| parent | e2b3af931b0a301650aa697e49b222168568642f (diff) | |
| parent | 67cf82fb857cf616c8ac19cbfbc3e5f78cd9dc61 (diff) | |
Merge branch 'tracking-armlt-juno' into integration-linaro-vexpresstracking-integration-linaro-vexpress-ll-20140409.0tracking-integration-linaro-vexpress-ll-20140407.0
Conflicts:
arch/arm64/kernel/debug-monitors.c
Diffstat (limited to 'drivers/cpufreq/Kconfig')
| -rw-r--r-- | drivers/cpufreq/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig index 3a7202d38bd8..cb5b9364e567 100644 --- a/drivers/cpufreq/Kconfig +++ b/drivers/cpufreq/Kconfig @@ -228,7 +228,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 |