Skip to content

Commit 0b86b25

Browse files
committed
Merge tag 'arm-soc/for-5.6/defconfig-fixes' of https://github.com/Broadcom/stblinux into arm/fixes
This pull request contains Broadcom ARM-based SoCs defconfig file(s) fixes for v5.6, please pull the following: - Stefan restores CONFIG_DEBUG_FS from the bcm2835_defconfig which was accidentally removed * tag 'arm-soc/for-5.6/defconfig-fixes' of https://github.com/Broadcom/stblinux: ARM: bcm2835_defconfig: Explicitly restore CONFIG_DEBUG_FS Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Olof Johansson <[email protected]>
2 parents 14022b1 + 1bba608 commit 0b86b25

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

arch/arm/configs/bcm2835_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ CONFIG_SCHED_TRACER=y
178178
CONFIG_STACK_TRACER=y
179179
CONFIG_FUNCTION_PROFILER=y
180180
CONFIG_TEST_KSTRTOX=y
181+
CONFIG_DEBUG_FS=y
181182
CONFIG_KGDB=y
182183
CONFIG_KGDB_KDB=y
183184
CONFIG_STRICT_DEVMEM=y

0 commit comments

Comments
 (0)