diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-08-26 07:39:13 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-08-26 07:39:13 +0200 |
| commit | 14577d40d92138ce687a487430419effe680a33d (patch) | |
| tree | 0c179d5c06fd5f45a873263c56d14684e34d991d /kernel-armv7hl.config | |
| parent | b5c0ce530cf67f9c4a5921b11474c8e565f6585c (diff) | |
| parent | 565f0372e6c702c2deaf41f43a03994a6201a8dc (diff) | |
| download | kernel-14577d40d92138ce687a487430419effe680a33d.tar.gz kernel-14577d40d92138ce687a487430419effe680a33d.tar.xz kernel-14577d40d92138ce687a487430419effe680a33d.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.19.0-0.rc0.git12.1.vanilla.knurd.1.fc29kernel-4.19.0-0.rc0.git12.1.vanilla.knurd.1.fc28
Diffstat (limited to 'kernel-armv7hl.config')
| -rw-r--r-- | kernel-armv7hl.config | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index d071a2d40..a01534184 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -170,6 +170,7 @@ CONFIG_AM335X_CONTROL_USB=m CONFIG_AM335X_PHY_USB=m CONFIG_AMBA_PL08X=y CONFIG_AMD8111_ETH=m +# CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m # CONFIG_AMD_XGBE_DCB is not set # CONFIG_AMD_XGBE is not set @@ -2654,6 +2655,8 @@ CONFIG_IO_DELAY_0X80=y # CONFIG_IO_DELAY_0XED is not set # CONFIG_IO_DELAY_NONE is not set # CONFIG_IO_DELAY_UDELAY is not set +# CONFIG_IOMMU_DEBUGFS is not set +# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set CONFIG_IOMMU_DMA=y # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set |