From 84fe27dfd1dbf99895e1b21e407afe6578504817 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 23 Nov 2007 15:31:40 -0500 Subject: [PATCH] Import 2.3.46 --- arch/i386/defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/i386/defconfig b/arch/i386/defconfig index c071ab505c67..09f9e039f9a1 100644 --- 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 -- 2.39.5