diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-03-20 12:46:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-20 12:46:26 -0400 |
| commit | 61816596d1c9026d0ecb20c44f90452c41596ffe (patch) | |
| tree | 3027ed6dc62f71e14b9d525405747fa0eb8f074d /arch/arm/plat-spear/Kconfig | |
| parent | net: fix psock_fanout selftest hash collision (diff) | |
| parent | net: fec: Define indexes as 'unsigned int' (diff) | |
| download | linux-dev-61816596d1c9026d0ecb20c44f90452c41596ffe.tar.xz linux-dev-61816596d1c9026d0ecb20c44f90452c41596ffe.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull in the 'net' tree to get Daniel Borkmann's flow dissector
infrastructure change.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/plat-spear/Kconfig')
| -rw-r--r-- | arch/arm/plat-spear/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-spear/Kconfig b/arch/arm/plat-spear/Kconfig index 739d016eb273..8a08c31b5e20 100644 --- a/arch/arm/plat-spear/Kconfig +++ b/arch/arm/plat-spear/Kconfig @@ -10,7 +10,7 @@ choice config ARCH_SPEAR13XX bool "ST SPEAr13xx with Device Tree" - select ARCH_HAVE_CPUFREQ + select ARCH_HAS_CPUFREQ select ARM_GIC select CPU_V7 select GPIO_SPEAR_SPICS |