diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-04-05 14:14:19 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-05 14:14:19 -0700 |
| commit | f83f7151950dd9e0f6b4a1a405bf5e55c5294e4d (patch) | |
| tree | f8d9d8ee821fcc9f0a8e1a8679bc622219c70e3b /drivers/i2c/busses/Kconfig | |
| parent | Merge branch 'tipc-improve-TIPC-unicast-link-throughput' (diff) | |
| parent | Merge tag 'mm-compaction-5.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/mel/linux (diff) | |
| download | linux-dev-f83f7151950dd9e0f6b4a1a405bf5e55c5294e4d.tar.xz linux-dev-f83f7151950dd9e0f6b4a1a405bf5e55c5294e4d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor comment merge conflict in mlx5.
Staging driver has a fixup due to the skb->xmit_more changes
in 'net-next', but was removed in 'net'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/i2c/busses/Kconfig')
| -rw-r--r-- | drivers/i2c/busses/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index f2c681971201..f8979abb9a19 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -131,6 +131,7 @@ config I2C_I801 Cannon Lake (PCH) Cedar Fork (PCH) Ice Lake (PCH) + Comet Lake (PCH) This driver can also be built as a module. If so, the module will be called i2c-i801. |