summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2016-03-22 18:01:56 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2016-03-22 18:01:56 -0400
commitcaf67e0739a737bcfdfbde505664f2880c79b5ed (patch)
tree89243196c249d7de59d7bae407a7f1bb7b1bc2ee /config-generic
parenta01e1aa804570861736c37402ec8651a7e5933f8 (diff)
downloadkernel-caf67e0739a737bcfdfbde505664f2880c79b5ed.tar.gz
kernel-caf67e0739a737bcfdfbde505664f2880c79b5ed.tar.xz
kernel-caf67e0739a737bcfdfbde505664f2880c79b5ed.zip
Linux v4.5-11312-g01cde1538e1d
- nfs, overlayfs, fuse, xen, i2c, target, pci, sound, iommu merges
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic2
1 files changed, 2 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index 85d0d9733..ba36529cd 100644
--- a/config-generic
+++ b/config-generic
@@ -109,6 +109,7 @@ CONFIG_PCIE_ECRC=y
CONFIG_PCIEAER_INJECT=m
CONFIG_HOTPLUG_PCI=y
# CONFIG_HOTPLUG_PCI_CPCI is not set
+# CONFIG_HOTPLUG_PCI_SHPC is not set
CONFIG_HOTPLUG_PCI_PCIE=y
# CONFIG_PCIE_DW_PLAT is not set
@@ -2694,6 +2695,7 @@ CONFIG_I2C_CHARDEV=m
# CONFIG_I2C_MUX_PCA9541 is not set
# CONFIG_I2C_MUX_PINCTRL is not set
# CONFIG_I2C_MUX_REG is not set
+# CONFIG_I2C_DEMUX_PINCTRL is not set
# CONFIG_I2C_CADENCE is not set
#