Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 9b780e0d2c18f3247eecb1e40d3dea9da79df6d1..190cc48abc0cc683b8d53e9f8460d67cbe93c671 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -152,6 +152,7 @@ config PPC
        select DCACHE_WORD_ACCESS if PPC64 && CPU_LITTLE_ENDIAN
        select NO_BOOTMEM
        select HAVE_GENERIC_RCU_GUP
+       select HAVE_PERF_EVENTS_NMI if PPC64
 
 config GENERIC_CSUM
        def_bool CPU_LITTLE_ENDIAN
@@ -189,9 +190,6 @@ config ARCH_MAY_HAVE_PC_FDC
        bool
        default PCI
 
-config PPC_OF
-       def_bool y
-
 config PPC_UDBG_16550
        bool
        default n