summaryrefslogtreecommitdiff
path: root/drivers/platform/x86/Kconfig
diff options
context:
space:
mode:
authorJason Gunthorpe <jgg@nvidia.com>2023-04-04 17:03:24 +0300
committerJason Gunthorpe <jgg@nvidia.com>2023-04-04 17:04:30 +0300
commit692d42d411b7db6a76382537fccbee3a12a2bcdb (patch)
tree24770529cf173188bc5d2d0d9331c0ac723b631e /drivers/platform/x86/Kconfig
parentc52159b5be7894540acdc7a35791c0b57097fa4c (diff)
parent13a0d1ae7ee6b438f5537711a8c60cba00554943 (diff)
downloadlinux-692d42d411b7db6a76382537fccbee3a12a2bcdb.tar.xz
Merge branch 'iommufd/for-rc' into for-next
The following selftest patch requires both the bug fixes and the improvements of the selftest framework. * iommufd/for-rc: iommufd: Do not corrupt the pfn list when doing batch carry iommufd: Fix unpinning of pages when an access is present iommufd: Check for uptr overflow Linux 6.3-rc5 Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'drivers/platform/x86/Kconfig')
-rw-r--r--drivers/platform/x86/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index ec7c2b4e1721..4a01b315e0a9 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -955,7 +955,8 @@ config SERIAL_MULTI_INSTANTIATE
config MLX_PLATFORM
tristate "Mellanox Technologies platform support"
- depends on I2C && REGMAP
+ depends on I2C
+ select REGMAP
help
This option enables system support for the Mellanox Technologies
platform. The Mellanox systems provide data center networking