m68k: merge mmu and non-mmu versions of processor.h
[linux-2.6.git] / arch / sh / Kconfig.cpu
index d850184..cd6e3ea 100644 (file)
@@ -12,6 +12,7 @@ config CPU_LITTLE_ENDIAN
 
 config CPU_BIG_ENDIAN
        bool "Big Endian"
+       depends on !CPU_SH5
 
 endchoice
 
@@ -75,11 +76,6 @@ config SPECULATIVE_EXECUTION
 
          If unsure, say N.
 
-config SH64_USER_MISALIGNED_FIXUP
-       def_bool y
-       prompt "Fixup misaligned loads/stores occurring in user mode"
-       depends on SUPERH64
-
 config SH64_ID2815_WORKAROUND
        bool "Include workaround for SH5-101 cut2 silicon defect ID2815"
        depends on CPU_SUBTYPE_SH5_101
@@ -87,9 +83,6 @@ config SH64_ID2815_WORKAROUND
 config CPU_HAS_INTEVT
        bool
 
-config CPU_HAS_MASKREG_IRQ
-       bool
-
 config CPU_HAS_IPR_IRQ
        bool
 
@@ -103,7 +96,7 @@ config CPU_HAS_SR_RB
          See <file:Documentation/sh/register-banks.txt> for further
          information on SR.RB and register banking in the kernel in general.
 
-config CPU_HAS_PTEA
+config CPU_HAS_PTEAEX
        bool
 
 config CPU_HAS_DSP