Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[sfrench/cifs-2.6.git] / arch / arc / Kconfig

diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index 283099c9560aa296377d588e0402d5e0b49884b4..c9f30f4763abce5ca1ffda1817e87bb5de410861 100644 (file)
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -180,16 +180,12 @@ config CPU_BIG_ENDIAN
 config SMP
        bool "Symmetric Multi-Processing"
        default n
-       select ARC_HAS_COH_CACHES if ISA_ARCV2
        select ARC_MCIP if ISA_ARCV2
        help
          This enables support for systems with more than one CPU.
 
 if SMP
 
-config ARC_HAS_COH_CACHES
-       def_bool n
-
 config NR_CPUS
        int "Maximum number of CPUs (2-4096)"
        range 2 4096
@@ -219,8 +215,6 @@ config ARC_MCIP
 menuconfig ARC_CACHE
        bool "Enable Cache Support"
        default y
-       # if SMP, cache enabled ONLY if ARC implementation has cache coherency
-       depends on !SMP || ARC_HAS_COH_CACHES
 
 if ARC_CACHE
 
@@ -412,17 +406,6 @@ config ARC_HAS_DIV_REM
        bool "Insn: div, divu, rem, remu"
        default y
 
-config ARC_NUMBER_OF_INTERRUPTS
-       int "Number of interrupts"
-       range 8 240
-       default 32
-       help
-         This defines the number of interrupts on the ARCv2HS core.
-         It affects the size of vector table.
-         The initial 8 IRQs are fixed (Timer, ICI etc) and although configurable
-         in hardware, it keep things simple for Linux to assume they are always
-         present.
-
 endif  # ISA_ARCV2
 
 endmenu   # "ARC CPU Configuration"