- sorted kernel configs

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

diff --git a/kernel-x86.config b/kernel-x86.config
index 8a6a65c25ac6e499f3592e2493213cfe73f3e976..67d37a6da570e4201408ae64b43fadc1e8cd4b8c 100644 (file)
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -7,6 +7,7 @@ OPROFILE_EVENT_MULTIPLEX x86=y
 KPROBES x86=y
 JUMP_LABEL x86=y
 OPTPROBES x86=y
+CC_STACKPROTECTOR x86=y x86_64=y
 #- file kernel/gcov/Kconfig goes here
 
 #-
@@ -24,15 +25,10 @@ X86_NUMACHIP all=n
 X86_VSMP x86_64=n
 X86_UV i386=n x86_64=n
 X86_GOLDFISH all=n
-X86_WANT_INTEL_MID i486=n i586=n i686=n
 X86_INTEL_LPSS all=y
 X86_RDC321X i386=n
 X86_32_NON_STANDARD i386=y
-X86_NUMAQ i386=n
-X86_VISWS i386=n
 STA2X11 all=y
-X86_SUMMIT i386=n
-X86_ES7000 i386=n
 X86_32_IRIS i486=y i586=y i686=y
 SCHED_OMIT_FRAME_POINTER i386=y x86_64=y
 HYPERVISOR_GUEST all=y
@@ -80,7 +76,6 @@ HIGHMEM64G i386=n
 PAGE_OFFSET i386=0xC0000000
 DIRECT_GBPAGES x86=y
 NUMA x86_64=y
-#- NUMA (Summit) requires SMP, 64GB highmem support, ACPI
 AMD_NUMA x86=n
 X86_64_ACPI_NUMA x86_64=y
 NUMA_EMU x86_64=n
@@ -99,7 +94,6 @@ X86_PAT x86=y
 EFI x86=y
 EFI_STUB all=y
 SECCOMP x86=y
-CC_STACKPROTECTOR x86=y x86_64=y
 #- file kernel/Kconfig.hz goes here
 KEXEC x86=y
 CRASH_DUMP x86=n
@@ -203,7 +197,6 @@ STRICT_DEVMEM x86=y
 X86_VERBOSE_BOOTUP x86=n
 EARLY_PRINTK x86=y
 EARLY_PRINTK_DBGP x86=n
-DEBUG_STACKOVERFLOW x86=n
 X86_PTDUMP x86=n
 DEBUG_RODATA all=y
 DEBUG_RODATA_TEST all=n
@@ -292,6 +285,7 @@ GPIO_STA2X11 all=y
 #- PCI GPIO expanders:
 #- SPI GPIO expanders:
 #- AC97 GPIO expanders:
+#- LPC GPIO expanders:
 #- MODULbus GPIO expanders:
 #- USB GPIO expanders:
 
@@ -310,6 +304,7 @@ STA2X11_VIP all=m
 #- *** FILE: drivers/media/radio/Kconfig ***
 #-
 #- file drivers/media/radio/si470x/Kconfig goes here
+#- file drivers/media/radio/si4713/Kconfig goes here
 #- file drivers/media/radio/wl128x/Kconfig goes here
 V4L_RADIO_ISA_DRIVERS all=y
 
@@ -353,14 +348,15 @@ SPARSE_IRQ i386=y x86_64=y
 #-
 #- *** FILE: lib/Kconfig.debug ***
 #-
+#- file mm/Kconfig.debug goes here
 DEBUG_STACK_USAGE x86=n
 DEBUG_PER_CPU_MAPS x86=n
+DEBUG_STACKOVERFLOW x86=n
+#- file lib/Kconfig.kmemcheck goes here
 DEBUG_STRICT_USER_COPY_CHECKS x86=n
-#- file mm/Kconfig.debug goes here
 #- file kernel/trace/Kconfig goes here
 #- file samples/Kconfig goes here
 #- file lib/Kconfig.kgdb goes here
-#- file lib/Kconfig.kmemcheck goes here
 
 #-
 #- *** PROBABLY REMOVED OPTIONS ***
@@ -370,4 +366,9 @@ 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