diff options
| author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-08-13 10:42:44 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-08-13 10:42:44 -0300 |
| commit | 6af0f5b3ae8bb646b055a29e857dbd194a31930b (patch) | |
| tree | 52afbe196c21407ba988f058ccfe496638f7ff1b /libre/linux-libre/config.i686 | |
| parent | ac6448ddfebb681301211fb31a022f68a4df2b96 (diff) | |
| download | abslibre-6af0f5b3ae8bb646b055a29e857dbd194a31930b.tar.gz abslibre-6af0f5b3ae8bb646b055a29e857dbd194a31930b.tar.bz2 abslibre-6af0f5b3ae8bb646b055a29e857dbd194a31930b.zip | |
linux-libre-3.10.6-2: updating version
* move new changes from libre-testing to libre
* fixed https://bugs.archlinux.org/task/35991, https://bugs.archlinux.org/task/36296
Diffstat (limited to 'libre/linux-libre/config.i686')
| -rw-r--r-- | libre/linux-libre/config.i686 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index c27f50b4c..be09f460c 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.0-1 Kernel Configuration +# Linux/x86 3.10.5-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -681,10 +681,12 @@ CONFIG_I82365=m CONFIG_TCIC=m CONFIG_PCMCIA_PROBE=y CONFIG_PCCARD_NONSTATIC=y -CONFIG_HOTPLUG_PCI=m +CONFIG_HOTPLUG_PCI=y 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 |