diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2017-02-18 11:37:14 +0100 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-02-18 11:37:14 +0100 |
commit | 6c8f9ad566ddc63da5da84c3c9e6c1bb0434c64f (patch) | |
tree | 1ba41dcec5d5a3a7fff8643d5d28fe24bfc50798 /arch/powerpc/Kconfig | |
parent | powerpc/64: Implement clear_bit_unlock_is_negative_byte() (diff) | |
parent | powerpc/8xx: Perf events on PPC 8xx (diff) | |
download | linux-6c8f9ad566ddc63da5da84c3c9e6c1bb0434c64f.tar.xz linux-6c8f9ad566ddc63da5da84c3c9e6c1bb0434c64f.zip |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include 8xx breakpoints and perf, t1042rdb display support,
and board updates."
Diffstat (limited to 'arch/powerpc/Kconfig')
-rw-r--r-- | arch/powerpc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 260dd6a371e0..5e7aaa9976e2 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -115,7 +115,7 @@ config PPC select HAVE_PERF_REGS select HAVE_PERF_USER_STACK_DUMP select HAVE_REGS_AND_STACK_ACCESS_API - select HAVE_HW_BREAKPOINT if PERF_EVENTS && PPC_BOOK3S_64 + select HAVE_HW_BREAKPOINT if PERF_EVENTS && (PPC_BOOK3S || PPC_8xx) select ARCH_WANT_IPC_PARSE_VERSION select SPARSE_IRQ select IRQ_DOMAIN |