Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

[linux-drm-fsl-dcu.git] / arch / microblaze / Kconfig

diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 8370114e78aa4cea65a3ab5c44abbd19c4d39236..e23cccde9c2759b9ea798a3a0705f7f242acd474 100644 (file)
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -83,11 +83,6 @@ config MMU
        bool "MMU support"
        default n
 
-config NO_MMU
-       bool
-       depends on !MMU
-       default y
-
 comment "Boot options"
 
 config CMDLINE_BOOL
@@ -251,10 +246,6 @@ config MICROBLAZE_64K_PAGES
 
 endchoice
 
-config KERNEL_PAD
-       hex "Kernel PAD for unpacking" if ADVANCED_OPTIONS
-       default "0x80000" if MMU
-
 endmenu
 
 source "mm/Kconfig"