diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-09-15 22:57:56 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-09-15 22:57:57 +0300 |
| commit | 79774742bde749af0a0ef09663709b739aa07e67 (patch) | |
| tree | a00e563f822527c79b2b4022bbf7bc4d74736556 /arch/arm64/configs | |
| parent | 5a4ca019f6276429945d4b15691552d522c9a3ac (diff) | |
| parent | d30b361310f808fbb5837edd598cb5aaa3fca737 (diff) | |
| download | linux-79774742bde749af0a0ef09663709b739aa07e67.tar.xz | |
Merge tag 'arm-soc/for-6.1/defconfig-arm64' of https://github.com/Broadcom/stblinux into arm/defconfig
This pull request contains Broadcom ARM64 defconfig changes for 6.1,
please pull the following:
- William completes the removal of ARCH_BCM4908 by removing that Kconfig
entry from the defconfig since it is being deleted after having been
transitional through 6.0
* tag 'arm-soc/for-6.1/defconfig-arm64' of https://github.com/Broadcom/stblinux:
arm64: defconfig: remove BCM4908
Link: https://lore.kernel.org/r/20220915023044.2350782-1-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64/configs')
| -rw-r--r-- | arch/arm64/configs/defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 2719b96bbc09..48aa433f7217 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -35,7 +35,6 @@ CONFIG_ARCH_ALPINE=y CONFIG_ARCH_APPLE=y CONFIG_ARCH_BCM=y CONFIG_ARCH_BCM2835=y -CONFIG_ARCH_BCM4908=y CONFIG_ARCH_BCMBCA=y CONFIG_ARCH_BCM_IPROC=y CONFIG_ARCH_BERLIN=y |