diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-03-04 15:58:00 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-03-04 15:58:00 +0100 |
| commit | 1c2af4968ea533e875d7cf8d095c084f18164f5d (patch) | |
| tree | f8bb9989ff0a770a1324ed3a44acace3c35de63d /arch/arm/mach-hisi/Kconfig | |
| parent | a2fa301fddfcb614568a74317fe9b935dd980045 (diff) | |
| parent | 56041bf920d2937b7cadcb30cb206f0372eee814 (diff) | |
| download | linux-rt-1c2af4968ea533e875d7cf8d095c084f18164f5d.tar.gz | |
Merge tag 'kvm-for-3.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into kvm-next
Diffstat (limited to 'arch/arm/mach-hisi/Kconfig')
| -rw-r--r-- | arch/arm/mach-hisi/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-hisi/Kconfig b/arch/arm/mach-hisi/Kconfig index 8f4649b301b2..1abae5f6a418 100644 --- a/arch/arm/mach-hisi/Kconfig +++ b/arch/arm/mach-hisi/Kconfig @@ -8,7 +8,7 @@ config ARCH_HI3xxx select CLKSRC_OF select GENERIC_CLOCKEVENTS select HAVE_ARM_SCU - select HAVE_ARM_TWD + select HAVE_ARM_TWD if SMP select HAVE_SMP select PINCTRL select PINCTRL_SINGLE |