From: Russell King Date: Fri, 12 Jun 2015 20:18:08 +0000 (+0100) Subject: Merge branches 'arnd-fixes', 'clk', 'misc', 'v7' and 'fixes' into for-next X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9de44aa4dc969e4a46c2bfbd33d65bfa6ad2a15d;p=linux-beck.git Merge branches 'arnd-fixes', 'clk', 'misc', 'v7' and 'fixes' into for-next --- 9de44aa4dc969e4a46c2bfbd33d65bfa6ad2a15d diff --cc arch/arm/Kconfig index 0536e8d3cda3,45df48ba0b12,34b728583dae,45df48ba0b12,45df48ba0b12..b47457d9387c --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@@@@@ -57,10 -57,10 -57,10 -57,10 -57,10 +57,10 @@@@@@ config AR select HAVE_KERNEL_LZMA select HAVE_KERNEL_LZO select HAVE_KERNEL_XZ ---- select HAVE_KPROBES if !XIP_KERNEL ++++ select HAVE_KPROBES if !XIP_KERNEL && !CPU_ENDIAN_BE32 && !CPU_V7M select HAVE_KRETPROBES if (HAVE_KPROBES) select HAVE_MEMBLOCK -- -- select HAVE_MOD_ARCH_SPECIFIC if ARM_UNWIND ++ ++ select HAVE_MOD_ARCH_SPECIFIC select HAVE_OPROFILE if (HAVE_PERF_EVENTS) select HAVE_OPTPROBES if !THUMB2_KERNEL select HAVE_PERF_EVENTS