Merge branch 'kconfig-diet' from Dave Hansen

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

diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index cff2aad310418e3ac7ce7b1d88b3808cc64f01cd..68fcbb2d59e2abbaac1691652865f33f78949753 100644 (file)
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -185,6 +185,7 @@ config ARC_CACHE_PAGES
 
 config ARC_CACHE_VIPT_ALIASING
        bool "Support VIPT Aliasing D$"
+       depends on ARC_HAS_DCACHE
        default n
 
 endif  #ARC_CACHE
@@ -362,13 +363,6 @@ config ARC_MISALIGN_ACCESS
          Use ONLY-IF-ABS-NECESSARY as it will be very slow and also can hide
          potential bugs in code
 
-config ARC_STACK_NONEXEC
-       bool "Make stack non-executable"
-       default n
-       help
-         To disable the execute permissions of stack/heap of processes
-         which are enabled by default.
-
 config HZ
        int "Timer Frequency"
        default 100