summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2022-09-15 22:04:41 +0200
committerArnd Bergmann <arnd@arndb.de>2022-09-15 22:04:41 +0200
commit34fdb46f0fe2aac3ef2096a1df15ef4a66608c5c (patch)
tree0fbd2a3c85e207d37b9b7dc1e110c1e48cf7082a /drivers/i2c
parentd6ce6d14316e15f7831dfa447b4690093e949aac (diff)
parent7bb49d774f481fdd7bd053e034e4d206770fda04 (diff)
downloadlinux-stable-34fdb46f0fe2aac3ef2096a1df15ef4a66608c5c.tar.gz
linux-stable-34fdb46f0fe2aac3ef2096a1df15ef4a66608c5c.tar.bz2
linux-stable-34fdb46f0fe2aac3ef2096a1df15ef4a66608c5c.zip
Merge tag 'arm-soc/for-6.1/drivers' of https://github.com/Broadcom/stblinux into arm/drivers
This pull request contains Broadcom ARM/ARM64 SoC drivers updates for 6.1, please pull the following: - Guilherme adds a comment to the panic notifier, part of his big panic notifier rework series - William migrates all of ARCH_BCM4908 dependencies to ARCH_BCMBCA * tag 'arm-soc/for-6.1/drivers' of https://github.com/Broadcom/stblinux: arm64: bcmbca: Make BCM4908 drivers depend on ARCH_BCMBCA soc: bcm: brcmstb: Document panic notifier action and remove useless header Link: https://lore.kernel.org/r/20220915023044.2350782-4-f.fainelli@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 7284206b278b..0c48d8a9f44a 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -488,8 +488,8 @@ config I2C_BCM_KONA
config I2C_BRCMSTB
tristate "BRCM Settop/DSL I2C controller"
- depends on ARCH_BCM2835 || ARCH_BCM4908 || ARCH_BCMBCA || \
- ARCH_BRCMSTB || BMIPS_GENERIC || COMPILE_TEST
+ depends on ARCH_BCM2835 || ARCH_BCMBCA || ARCH_BRCMSTB || \
+ BMIPS_GENERIC || COMPILE_TEST
default y
help
If you say yes to this option, support will be included for the