diff options
| author | Olof Johansson <olof@lixom.net> | 2020-03-02 11:54:24 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-03-02 11:54:59 -0800 |
| commit | 0b86b258e644c5f547005654cde0913d9e2ab5bc (patch) | |
| tree | fbbf6dddbb29a0a0e64a761b1400443eb225f317 | |
| parent | 14022b11d65700f35db9d85303dfb29149329e65 (diff) | |
| parent | 1bba60808404b873defa0f3560497eb2e8fe86b8 (diff) | |
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/20200302195043.14513-1-f.fainelli@gmail.com
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/configs/bcm2835_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig index 519ff58e67b3..0afcae9f7cf8 100644 --- a/arch/arm/configs/bcm2835_defconfig +++ b/arch/arm/configs/bcm2835_defconfig @@ -178,6 +178,7 @@ CONFIG_SCHED_TRACER=y CONFIG_STACK_TRACER=y CONFIG_FUNCTION_PROFILER=y CONFIG_TEST_KSTRTOX=y +CONFIG_DEBUG_FS=y CONFIG_KGDB=y CONFIG_KGDB_KDB=y CONFIG_STRICT_DEVMEM=y |