- new location of g_midi module

[packages/kernel.git] / kernel-x86.config

diff --git a/kernel-x86.config b/kernel-x86.config
index 67d37a6da570e4201408ae64b43fadc1e8cd4b8c..00e650a041a5bcdbc1644352e66c62a581ce0c31 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -25,6 +25,7 @@ X86_NUMACHIP all=n
 X86_VSMP x86_64=n
 X86_UV i386=n x86_64=n
 X86_GOLDFISH all=n
+X86_INTEL_MID i386=n
 X86_INTEL_LPSS all=y
 X86_RDC321X i386=n
 X86_32_NON_STANDARD i386=y
@@ -67,7 +68,6 @@ X86_REBOOTFIXUPS i386=y
 MICROCODE x86=m
 MICROCODE_INTEL x86=y
 MICROCODE_AMD x86=y
-MICROCODE_INTEL_EARLY all=y
 X86_MSR x86=m
 X86_CPUID x86=m
 NOHIGHMEM i386=n
@@ -99,7 +99,8 @@ KEXEC x86=y
 CRASH_DUMP x86=n
 KEXEC_JUMP x86=y
 PHYSICAL_START x86=0x1000000
-RELOCATABLE i386=y x86_64=n
+RELOCATABLE i386=y x86_64=y
+RANDOMIZE_BASE i386=y x86_64=y
 PHYSICAL_ALIGN i386=0x100000
 HOTPLUG_CPU x86=y
 BOOTPARAM_HOTPLUG_CPU0 all=n
@@ -357,18 +358,3 @@ DEBUG_STRICT_USER_COPY_CHECKS x86=n
 #- file kernel/trace/Kconfig goes here
 #- file samples/Kconfig goes here
 #- file lib/Kconfig.kgdb goes here
-
-#-
-#- *** PROBABLY REMOVED OPTIONS ***
-#-
-EARLY_PRINTK_MRST x86=n
-KVM_CLOCK x86=y
-M386 i386=y i486=n i586=n i686=n pentium3=n pentium4=n athlon=n
-MCA i386=y
-PARAVIRT_GUEST x86=y
-X86_ES7000 i386=n
-X86_MRST i386=y
-X86_NUMAQ i386=n
-X86_SUMMIT i386=n
-X86_VISWS i386=n
-X86_WANT_INTEL_MID i486=n i586=n i686=n