diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-02-01 13:18:47 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-02-01 13:18:47 +0100 |
| commit | bee7bb315cd0b4529a4117b6220c29ca297fc023 (patch) | |
| tree | fe4741f257e50782e51bc2955ad4480cd2ba6396 /gnu/packages/aux-files/linux-libre/4.1-i686.conf | |
| parent | c2f0e5a44b537632c2655f97a2539c3bf02c8a63 (diff) | |
| parent | 8a4644336d5063fd0bf43e90e3c0823c76e82e4e (diff) | |
| download | guix-patches-bee7bb315cd0b4529a4117b6220c29ca297fc023.tar guix-patches-bee7bb315cd0b4529a4117b6220c29ca297fc023.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/aux-files/linux-libre/4.1-i686.conf')
| -rw-r--r-- | gnu/packages/aux-files/linux-libre/4.1-i686.conf | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/packages/aux-files/linux-libre/4.1-i686.conf b/gnu/packages/aux-files/linux-libre/4.1-i686.conf index a37225541e..c46ebc1804 100644 --- a/gnu/packages/aux-files/linux-libre/4.1-i686.conf +++ b/gnu/packages/aux-files/linux-libre/4.1-i686.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.1.0-gnu Kernel Configuration +# Linux/x86 4.1.49-gnu Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -738,6 +738,7 @@ CONFIG_PCIEASPM_DEFAULT=y # CONFIG_PCIEASPM_POWERSAVE is not set # CONFIG_PCIEASPM_PERFORMANCE is not set CONFIG_PCIE_PME=y +CONFIG_PCI_BUS_ADDR_T_64BIT=y CONFIG_PCI_MSI=y # CONFIG_PCI_DEBUG is not set CONFIG_PCI_REALLOC_ENABLE_AUTO=y @@ -1302,6 +1303,7 @@ CONFIG_BRIDGE=m CONFIG_BRIDGE_IGMP_SNOOPING=y CONFIG_BRIDGE_VLAN_FILTERING=y CONFIG_HAVE_NET_DSA=y +# CONFIG_NET_DSA is not set CONFIG_VLAN_8021Q=m CONFIG_VLAN_8021Q_GVRP=y CONFIG_VLAN_8021Q_MVRP=y @@ -1954,7 +1956,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_DRBD=m # CONFIG_DRBD_FAULT_INJECTION is not set CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_NVME=m +CONFIG_BLK_DEV_NVME=y CONFIG_BLK_DEV_OSD=m CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_RAM=y @@ -2002,7 +2004,7 @@ CONFIG_HMC6352=m CONFIG_DS1682=m CONFIG_TI_DAC7512=m CONFIG_VMWARE_BALLOON=m -CONFIG_BMP085=y +CONFIG_BMP085=m CONFIG_BMP085_I2C=m CONFIG_BMP085_SPI=m CONFIG_PCH_PHUB=m |