diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-01 01:39:49 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-01 01:39:49 -0400 |
| commit | 92ce4cc63d5eb31fb1b2650d97d6d4c5fa47b793 (patch) | |
| tree | 9d8d74e4bc1c82d42e2136d43f57189d6fb5f640 /arch/arm/Kconfig | |
| parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) | |
| parent | 0e2ee0c0610ec211a9f0ebf3088cbf4da422ebf8 (diff) | |
Merge tag 'soc-3.11-2' of git://git.infradead.org/users/jcooper/linux into next/soc
From Jason Cooper, mvebu soc changes for v3.11
Signed-off-by: Olof Johansson <olof@lixom.net>
* tag 'soc-3.11-2' of git://git.infradead.org/users/jcooper/linux:
arm: kirkwood: Instantiate cpufreq driver
arm: kirkwood: use the default of match table
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 49d993cee512..8ab5962a63a5 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -502,6 +502,7 @@ config ARCH_DOVE | |||
| 502 | 502 | ||
| 503 | config ARCH_KIRKWOOD | 503 | config ARCH_KIRKWOOD |
| 504 | bool "Marvell Kirkwood" | 504 | bool "Marvell Kirkwood" |
| 505 | select ARCH_HAS_CPUFREQ | ||
| 505 | select ARCH_REQUIRE_GPIOLIB | 506 | select ARCH_REQUIRE_GPIOLIB |
| 506 | select CPU_FEROCEON | 507 | select CPU_FEROCEON |
| 507 | select GENERIC_CLOCKEVENTS | 508 | select GENERIC_CLOCKEVENTS |