Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

1 files changed, 6 insertions, 0 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 0dbb4edc2dd1..4cbc6d8de210 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -24,6 +24,7 @@ config MIPS
         select GENERIC_IRQ_PROBE
         select GENERIC_IRQ_SHOW
         select HAVE_ARCH_JUMP_LABEL
+        select IRQ_FORCED_THREADING
 
 menu "Machine selection"
 
@@ -715,6 +716,7 @@ config CAVIUM_OCTEON_SIMULATOR
         select SYS_SUPPORTS_HIGHMEM
         select SYS_SUPPORTS_HOTPLUG_CPU
         select SYS_HAS_CPU_CAVIUM_OCTEON
+        select HOLES_IN_ZONE
         help
           The Octeon simulator is software performance model of the Cavium
           Octeon Processor. It supports simulating Octeon processors on x86
@@ -737,6 +739,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
         select ZONE_DMA32
         select USB_ARCH_HAS_OHCI
         select USB_ARCH_HAS_EHCI
+        select HOLES_IN_ZONE
         help
           This option supports all of the Octeon reference boards from Cavium
           Networks. It builds a kernel that dynamically determines the Octeon
@@ -967,6 +970,9 @@ config ISA_DMA_API
 config GENERIC_GPIO
         bool
 
+config HOLES_IN_ZONE
+        bool
+
 #
 # Endianess selection.  Sufficiently obscure so many users don't know what to
 # answer,so we try hard to limit the available choices.  Also the use of a