diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-10-30 15:37:00 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-10-30 15:37:02 +1100 |
| commit | 7241659cb109a3adfa65676539bdc36cd208208e (patch) | |
| tree | aaac6b74b9d5973fb56479d0b5611a5030edeaa7 /arch/arm64/Kconfig | |
| parent | 3dbf3bfb050b899908bb9f5cfe5348245db7c17d (diff) | |
| parent | fb5abcd2652315b6094250254a73ae5089fab487 (diff) | |
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/h8300/include/asm/Kbuild
include/linux/acpi.h
include/linux/wait.h
tools/perf/config/Makefile
tools/perf/config/feature-tests.mak
Diffstat (limited to 'arch/arm64/Kconfig')
| -rw-r--r-- | arch/arm64/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index bbb5d9480130..37a2776207cb 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -15,6 +15,7 @@ config ARM64 select GENERIC_IOMAP select GENERIC_IRQ_PROBE select GENERIC_IRQ_SHOW + select GENERIC_SCHED_CLOCK select GENERIC_SMP_IDLE_THREAD select GENERIC_TIME_VSYSCALL select HARDIRQS_SW_RESEND |