diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2017-09-09 17:34:41 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@armlinux.org.uk> | 2017-09-09 17:34:41 +0200 |
commit | e558bdc21ae1f0db520eccd84015e17d8a589973 (patch) | |
tree | b436123bd52f267b8c7f361618cded3e1e4421ea /arch/arm/configs/hackkit_defconfig | |
parent | ARM: 8692/1: mm: abort uaccess retries upon fatal signal (diff) | |
parent | ARM: 8691/1: Export save_stack_trace_tsk() (diff) | |
download | linux-e558bdc21ae1f0db520eccd84015e17d8a589973.tar.xz linux-e558bdc21ae1f0db520eccd84015e17d8a589973.zip |
Merge branches 'fixes' and 'misc' into for-linus
Diffstat (limited to 'arch/arm/configs/hackkit_defconfig')
-rw-r--r-- | arch/arm/configs/hackkit_defconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/configs/hackkit_defconfig b/arch/arm/configs/hackkit_defconfig index bed804729929..742d18cdabde 100644 --- a/arch/arm/configs/hackkit_defconfig +++ b/arch/arm/configs/hackkit_defconfig @@ -1,4 +1,3 @@ -CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y CONFIG_LOG_BUF_SHIFT=14 CONFIG_BLK_DEV_INITRD=y @@ -22,7 +21,6 @@ CONFIG_SYN_COOKIES=y CONFIG_MTD=y CONFIG_MTD_DEBUG=y CONFIG_MTD_DEBUG_VERBOSE=3 -CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y CONFIG_MTD_CFI_INTELEXT=y @@ -44,6 +42,5 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_SPINLOCK=y CONFIG_DEBUG_USER=y -CONFIG_DEBUG_ERRORS=y CONFIG_DEBUG_LL=y # CONFIG_CRC32 is not set |