diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-10-07 08:08:44 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-10-07 08:08:44 +0200 |
| commit | 8ab9431272717b54609f7f93d9e507eab417a95b (patch) | |
| tree | e11170bb719bfbca6d65fdc121883f28e82e007f /kernel-aarch64.config | |
| parent | e3e2f386afb9a395cdab00733c3cd1e6f2b53507 (diff) | |
| parent | 2b8f265622da10409c2b9dcd2c5e579a713de9d9 (diff) | |
| download | kernel-8ab9431272717b54609f7f93d9e507eab417a95b.tar.gz kernel-8ab9431272717b54609f7f93d9e507eab417a95b.tar.xz kernel-8ab9431272717b54609f7f93d9e507eab417a95b.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.14.0-0.rc3.git4.1.vanilla.knurd.1.fc28kernel-4.14.0-0.rc3.git4.1.vanilla.knurd.1.fc27kernel-4.14.0-0.rc3.git4.1.vanilla.knurd.1.fc26kernel-4.14.0-0.rc3.git4.1.vanilla.knurd.1.fc25
Diffstat (limited to 'kernel-aarch64.config')
| -rw-r--r-- | kernel-aarch64.config | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 3b6e12985..18ecfca1b 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -3577,6 +3577,7 @@ CONFIG_NET_VENDOR_ROCKER=y CONFIG_NET_VENDOR_SILAN=y CONFIG_NET_VENDOR_SIS=y CONFIG_NET_VENDOR_SMSC=y +CONFIG_NET_VENDOR_SNI=y # CONFIG_NET_VENDOR_SOLARFLARE is not set CONFIG_NET_VENDOR_STMICRO=y # CONFIG_NET_VENDOR_SUN is not set @@ -3955,6 +3956,7 @@ CONFIG_PCIE_ARMADA_8K=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y CONFIG_PCIE_DPC=y +CONFIG_PCIE_DW_HOST_ECAM=y CONFIG_PCIE_DW_HOST=y # CONFIG_PCIE_DW_PLAT is not set CONFIG_PCIE_DW=y @@ -5362,8 +5364,10 @@ CONFIG_SND_VIRMIDI=m CONFIG_SND_VIRTUOSO=m CONFIG_SND_VX222=m CONFIG_SND_YMFPCI=m +CONFIG_SNI_NETSEC=m # CONFIG_SOC_BRCMSTB is not set # CONFIG_SOC_CAMERA is not set +CONFIG_SOCIONEXT_SYNQUACER_PREITS=y CONFIG_SOC_TEGRA_FLOWCTRL=y # CONFIG_SOC_TI is not set # CONFIG_SOC_ZTE is not set |