diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-10-09 12:11:35 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-10-09 12:11:35 -0300 |
| commit | cf2a7954247c27c9e2f4fa1cb07edf9a3d86cbad (patch) | |
| tree | 9ade900528f0dce19c9cbf6626e725bcfe2b63e9 /kernels/linux-libre-rt/config.i686 | |
| parent | 70f4901b7b9482b3fdbfb5d29d8494a36e5ebfcc (diff) | |
| parent | 1fa844577c4e278eb1096e2221406d5840f354de (diff) | |
Merge branch 'master' of vparabola:abslibre
Diffstat (limited to 'kernels/linux-libre-rt/config.i686')
| -rw-r--r-- | kernels/linux-libre-rt/config.i686 | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/kernels/linux-libre-rt/config.i686 b/kernels/linux-libre-rt/config.i686 index 8b98c58a5..80fc256ef 100644 --- a/kernels/linux-libre-rt/config.i686 +++ b/kernels/linux-libre-rt/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.9 Kernel Configuration +# Linux/x86 3.10.4 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -674,12 +674,10 @@ CONFIG_I82365=m CONFIG_TCIC=m CONFIG_PCMCIA_PROBE=y CONFIG_PCCARD_NONSTATIC=y -CONFIG_HOTPLUG_PCI=y +CONFIG_HOTPLUG_PCI=m CONFIG_HOTPLUG_PCI_COMPAQ=m # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set CONFIG_HOTPLUG_PCI_IBM=m -CONFIG_HOTPLUG_PCI_ACPI=y -CONFIG_HOTPLUG_PCI_ACPI_IBM=m CONFIG_HOTPLUG_PCI_CPCI=y CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m @@ -758,8 +756,8 @@ CONFIG_INET_XFRM_MODE_TRANSPORT=m CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_LRO=y -CONFIG_INET_DIAG=m -CONFIG_INET_TCP_DIAG=m +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y CONFIG_INET_UDP_DIAG=m CONFIG_TCP_CONG_ADVANCED=y CONFIG_TCP_CONG_BIC=m @@ -1630,7 +1628,7 @@ CONFIG_AD525X_DPOT_I2C=m # CONFIG_AD525X_DPOT_SPI is not set # CONFIG_DUMMY_IRQ is not set # CONFIG_IBM_ASM is not set -# CONFIG_HWLAT_DETECTOR is not set +CONFIG_HWLAT_DETECTOR=m CONFIG_PHANTOM=m CONFIG_INTEL_MID_PTI=m CONFIG_SGI_IOC4=m |