2 files changed, 8 insertions, 28 deletions

diff --git a/arch/microblaze/platform/Kconfig.platform b/arch/microblaze/platform/Kconfig.platform
index 8e9b4752d3ff..28e418a3c0b4 100644
--- a/arch/microblaze/platform/Kconfig.platform
+++ b/arch/microblaze/platform/Kconfig.platform
@@ -59,25 +59,6 @@ config OPT_LIB_ASM
           Allows turn on optimalized library function (memcpy and memmove).
           Function are written in asm code.
 
-# This is still a bit broken - disabling for now JW 20070504
-config ALLOW_EDIT_AUTO
-        bool "Permit Display/edit of Kconfig.auto platform settings"
-        default n
-        help
-          Allows the editing of auto-generated platform settings from
-          the Kconfig.auto file. Obviously this does not change the
-          underlying hardware, so be very careful if you go editing
-          these settings.
-
-          Also, if you enable this, and edit various Kconfig.auto
-          settings, YOUR CHANGES WILL BE LOST if you then disable it
-          again. You have been warned!
-
-          If unsure, say no.
-
-comment "Automatic platform settings from Kconfig.auto"
-        depends on ALLOW_EDIT_AUTO
-
 if PLATFORM_GENERIC=y
         source "arch/microblaze/platform/generic/Kconfig.auto"
 endif
diff --git a/arch/microblaze/platform/generic/Kconfig.auto b/arch/microblaze/platform/generic/Kconfig.auto
index fbca22d9c8b9..1eaa49ea8f2d 100644
--- a/arch/microblaze/platform/generic/Kconfig.auto
+++ b/arch/microblaze/platform/generic/Kconfig.auto
@@ -21,7 +21,6 @@
 
 # Definitions for MICROBLAZE0
 comment "Definitions for MICROBLAZE0"
-        depends on ALLOW_EDIT_AUTO
 
 config KERNEL_BASE_ADDR
         hex "Physical address where Linux Kernel is"
@@ -30,33 +29,33 @@ config KERNEL_BASE_ADDR
           BASE Address for kernel
 
 config XILINX_MICROBLAZE0_FAMILY
-        string "Targetted FPGA family" if ALLOW_EDIT_AUTO
+        string "Targetted FPGA family"
         default "virtex5"
 
 config XILINX_MICROBLAZE0_USE_MSR_INSTR
-        int "USE_MSR_INSTR range (0:1)" if ALLOW_EDIT_AUTO
+        int "USE_MSR_INSTR range (0:1)"
         default 1
 
 config XILINX_MICROBLAZE0_USE_PCMP_INSTR
-        int "USE_PCMP_INSTR range (0:1)" if ALLOW_EDIT_AUTO
+        int "USE_PCMP_INSTR range (0:1)"
         default 1
 
 config XILINX_MICROBLAZE0_USE_BARREL
-        int "USE_BARREL range (0:1)" if ALLOW_EDIT_AUTO
+        int "USE_BARREL range (0:1)"
         default 1
 
 config XILINX_MICROBLAZE0_USE_DIV
-        int "USE_DIV range (0:1)" if ALLOW_EDIT_AUTO
+        int "USE_DIV range (0:1)"
         default 1
 
 config XILINX_MICROBLAZE0_USE_HW_MUL
-        int "USE_HW_MUL values (0=NONE, 1=MUL32, 2=MUL64)" if ALLOW_EDIT_AUTO
+        int "USE_HW_MUL values (0=NONE, 1=MUL32, 2=MUL64)"
         default 2
 
 config XILINX_MICROBLAZE0_USE_FPU
-        int "USE_FPU values (0=NONE, 1=BASIC, 2=EXTENDED)" if ALLOW_EDIT_AUTO
+        int "USE_FPU values (0=NONE, 1=BASIC, 2=EXTENDED)"
         default 2
 
 config XILINX_MICROBLAZE0_HW_VER
-        string "Core version number" if ALLOW_EDIT_AUTO
+        string "Core version number"
         default 7.10.d