diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-11 16:04:13 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-11 16:04:13 +0200 |
commit | ddbf13e4c47fb53eb17706238fe66b8eaf9a3cd4 (patch) | |
tree | 134995e85e9dd747ef1a98e1f5ca18804afaad84 /configs | |
parent | d8b1d4104de663bacffe18cf79ebf37fed8aac78 (diff) | |
parent | dd550c9cc80efee1ab4e4bbf4eafa9936711fa66 (diff) | |
download | kernel-ddbf13e4c47fb53eb17706238fe66b8eaf9a3cd4.tar.gz kernel-ddbf13e4c47fb53eb17706238fe66b8eaf9a3cd4.tar.xz kernel-ddbf13e4c47fb53eb17706238fe66b8eaf9a3cd4.zip |
Merge remote-tracking branch 'origin/stabilization' into stabilization-user-thl-vanilla-fedora
Diffstat (limited to 'configs')
7 files changed, 4 insertions, 25 deletions
diff --git a/configs/fedora/generic/CONFIG_INFINIBAND_RTRS_SERVER b/configs/fedora/generic/CONFIG_INFINIBAND_RTRS_SERVER index 30fe516f4..64ed34d9f 100644 --- a/configs/fedora/generic/CONFIG_INFINIBAND_RTRS_SERVER +++ b/configs/fedora/generic/CONFIG_INFINIBAND_RTRS_SERVER @@ -1,21 +1 @@ -# CONFIG_INFINIBAND_RTRS_SERVER: -# -# RDMA transport server module. -# -# RDMA Transport (RTRS) server module processing connection and IO -# requests received from the RTRS client module, it will pass the -# IO requests to its user eg. RNBD_server. -# -# Symbol: INFINIBAND_RTRS_SERVER [=n] -# Type : tristate -# Defined at drivers/infiniband/ulp/rtrs/Kconfig:18 -# Prompt: RTRS server module -# Depends on: INFINIBAND [=m] && INFINIBAND_ADDR_TRANS [=y] -# Location: -# -> Device Drivers -# -> InfiniBand support (INFINIBAND [=m]) -# Selects: INFINIBAND_RTRS [=n] -# -# -# CONFIG_INFINIBAND_RTRS_SERVER=m diff --git a/configs/fedora/generic/CONFIG_SND_HDA_INTEL b/configs/fedora/generic/CONFIG_SND_HDA_INTEL index 6f057ecfe..dfe74ea98 100644 --- a/configs/fedora/generic/CONFIG_SND_HDA_INTEL +++ b/configs/fedora/generic/CONFIG_SND_HDA_INTEL @@ -1 +1 @@ -# CONFIG_SND_HDA_INTEL is not set +CONFIG_SND_HDA_INTEL=m diff --git a/configs/fedora/generic/arm/CONFIG_SND_SOC_FSL_MQS b/configs/fedora/generic/arm/CONFIG_SND_SOC_FSL_MQS new file mode 100644 index 000000000..23f9ddfca --- /dev/null +++ b/configs/fedora/generic/arm/CONFIG_SND_SOC_FSL_MQS @@ -0,0 +1 @@ +CONFIG_SND_SOC_FSL_MQS=m diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_TEGRA194_HOST b/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_TEGRA194_HOST index d79eeb7a7..005ca5c32 100644 --- a/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_TEGRA194_HOST +++ b/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_TEGRA194_HOST @@ -1 +1 @@ -CONFIG_PCIE_TEGRA194_HOST=m +CONFIG_PCIE_TEGRA194_HOST=y diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_TEGRA194_P2U b/configs/fedora/generic/arm/aarch64/CONFIG_PHY_TEGRA194_P2U index 23e44783c..96d1b8819 100644 --- a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_TEGRA194_P2U +++ b/configs/fedora/generic/arm/aarch64/CONFIG_PHY_TEGRA194_P2U @@ -1 +1 @@ -CONFIG_PHY_TEGRA194_P2U=m +CONFIG_PHY_TEGRA194_P2U=y diff --git a/configs/fedora/generic/powerpc/CONFIG_SND_HDA_INTEL b/configs/fedora/generic/powerpc/CONFIG_SND_HDA_INTEL deleted file mode 100644 index dfe74ea98..000000000 --- a/configs/fedora/generic/powerpc/CONFIG_SND_HDA_INTEL +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SND_HDA_INTEL=m diff --git a/configs/fedora/generic/x86/CONFIG_SND_HDA_INTEL b/configs/fedora/generic/x86/CONFIG_SND_HDA_INTEL deleted file mode 100644 index dfe74ea98..000000000 --- a/configs/fedora/generic/x86/CONFIG_SND_HDA_INTEL +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SND_HDA_INTEL=m |