Import 2.3.46

diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index c071ab505c67fb7013dd810b83a7100089bf845c..09f9e039f9a1becfe0d8897319bf70cc1f98267a 100644 (file)
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -27,6 +27,7 @@ CONFIG_X86_POPAD_OK=y
 CONFIG_X86_TSC=y
 CONFIG_X86_GOOD_APIC=y
 CONFIG_X86_PGE=y
+# CONFIG_MICROCODE is not set
 CONFIG_NOHIGHMEM=y
 # CONFIG_HIGHMEM4G is not set
 # CONFIG_HIGHMEM64G is not set
@@ -392,7 +393,6 @@ CONFIG_PSMOUSE=y
 # CONFIG_WATCHDOG is not set
 # CONFIG_NVRAM is not set
 # CONFIG_RTC is not set
-# CONFIG_MICROCODE is not set
 
 #
 # Video For Linux