Remove GENERIC_HARDIRQ config option

[~andy/linux] / arch / powerpc / Kconfig

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 5aecda05e0daf52d91a3281f99ddee551f4c3a8a..38f3b7e47ec5efd190018de0d9bba1d2ef5b4011 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -114,7 +114,6 @@ config PPC
        select HAVE_PERF_EVENTS
        select HAVE_REGS_AND_STACK_ACCESS_API
        select HAVE_HW_BREAKPOINT if PERF_EVENTS && PPC_BOOK3S_64
-       select HAVE_GENERIC_HARDIRQS
        select ARCH_WANT_IPC_PARSE_VERSION
        select SPARSE_IRQ
        select IRQ_DOMAIN
@@ -312,6 +311,26 @@ config MATH_EMULATION
          such as fsqrt on cores that do have an FPU but do not implement
          them (such as Freescale BookE).
 
+choice
+       prompt "Math emulation options"
+       default MATH_EMULATION_FULL
+       depends on MATH_EMULATION
+
+config MATH_EMULATION_FULL
+       bool "Emulate all the floating point instructions"
+       ---help---
+         Select this option will enable the kernel to support to emulate
+         all the floating point instructions. If your SoC doesn't have
+         a FPU, you should select this.
+
+config MATH_EMULATION_HW_UNIMPLEMENTED
+       bool "Just emulate the FPU unimplemented instructions"
+       ---help---
+         Select this if you know there does have a hardware FPU on your
+         SoC, but some floating point instructions are not implemented by that.
+
+endchoice
+
 config PPC_TRANSACTIONAL_MEM
        bool "Transactional Memory support for POWERPC"
        depends on PPC_BOOK3S_64
@@ -727,7 +746,6 @@ config PCI
        default y if !40x && !CPM2 && !8xx && !PPC_83xx \
                && !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON
        default PCI_QSPAN if !4xx && !CPM2 && 8xx
-       select ARCH_SUPPORTS_MSI
        select GENERIC_PCI_IOMAP
        help
          Find out whether your system includes a PCI bus. PCI is the name of