Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Kubecek <mkubecek@suse.cz>2019-08-20 07:45:03 +0200
committerMichal Kubecek <mkubecek@suse.cz>2019-08-20 07:45:03 +0200
commit846d183625abe6ad62d3dbcca31e8ab18afaa1e0 (patch)
treebaefe671bcee1b63db16dd98cc1fcee4d9b50fc9
parent6489e90effd7de114d9e9b70378b83f6f3ab6ec3 (diff)
parent737b221b281019cefb91a00066d2b5d72cdd89f5 (diff)
Merge branch 'users/afaerber/master/for-next'
Pull ARM config update from Andreas Färber.
-rw-r--r--config/arm64/vanilla2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index a488a603be..44985fbb22 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -4442,7 +4442,7 @@ CONFIG_I2C_DESIGNWARE_PCI=m
# CONFIG_I2C_EXYNOS5 is not set
CONFIG_I2C_GPIO=m
# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
-# CONFIG_I2C_IMX is not set
+CONFIG_I2C_IMX=m
CONFIG_I2C_IMX_LPI2C=m
CONFIG_I2C_KEMPLD=m
CONFIG_I2C_MESON=m