diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-08-20 04:09:18 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-08-20 04:09:18 +0300 |
| commit | f444fea7896dbc267249d27f604082a51b8efca2 (patch) | |
| tree | d72e809d28ff7a1cb02f648c858d106de1be859d /drivers/iio/accel/Kconfig | |
| parent | 9e5f10fe577be7974c721c0c2050fa6c967d4565 (diff) | |
| parent | f87d64319e6f980c82acfc9b95ed523d053fb7ac (diff) | |
| download | linux-f444fea7896dbc267249d27f604082a51b8efca2.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/ptp/Kconfig:
55c8fca1dae1 ("ptp_pch: Restore dependency on PCI")
e5f31552674e ("ethernet: fix PTP_1588_CLOCK dependencies")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/iio/accel/Kconfig')
| -rw-r--r-- | drivers/iio/accel/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig index 0e56ace61103..8d8b1ba42ff8 100644 --- a/drivers/iio/accel/Kconfig +++ b/drivers/iio/accel/Kconfig @@ -231,6 +231,7 @@ config DMARD10 config FXLS8962AF tristate + depends on I2C || !I2C # cannot be built-in for modular I2C config FXLS8962AF_I2C tristate "NXP FXLS8962AF/FXLS8964AF Accelerometer I2C Driver" @@ -247,6 +248,7 @@ config FXLS8962AF_I2C config FXLS8962AF_SPI tristate "NXP FXLS8962AF/FXLS8964AF Accelerometer SPI Driver" depends on SPI + depends on I2C || !I2C select FXLS8962AF select REGMAP_SPI help |