diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-14 15:49:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-14 15:49:09 -0700 |
| commit | 3086ae071686e0fff1c0006a635f101edc5f3540 (patch) | |
| tree | e462f3f14ce2d1339fcdab3543e368bce8b9fc2a /arch/arc/configs/nps_defconfig | |
| parent | 6693075e0f46979f956fefdd51997f533b392615 (diff) | |
| parent | 8d92e992a785f35d23f845206cf8c6cafbc264e0 (diff) | |
| download | linux-3086ae071686e0fff1c0006a635f101edc5f3540.tar.bz2 | |
Merge tag 'arc-5.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC fixes from Vineet Gupta:
- Fix __ALIGN_STR and __ALIGN to not use default junk padding
- Misc Kconfig cleanups, header updates
* tag 'arc-5.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: define __ALIGN_STR and __ALIGN symbols for ARC
ARC: show_regs: reduce lines of output
ARC: Replace <linux/clk-provider.h> by <linux/of_clk.h>
ARC: fpu: fix randconfig build error reported by 0-day test service
ARC: fix some Kconfig typos
ARC: Cleanup old Kconfig IO scheduler options
Diffstat (limited to 'arch/arc/configs/nps_defconfig')
| -rw-r--r-- | arch/arc/configs/nps_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arc/configs/nps_defconfig b/arch/arc/configs/nps_defconfig index 07f26ed39f02..f7a978dfdf1d 100644 --- a/arch/arc/configs/nps_defconfig +++ b/arch/arc/configs/nps_defconfig @@ -21,8 +21,6 @@ CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set -# CONFIG_IOSCHED_DEADLINE is not set -# CONFIG_IOSCHED_CFQ is not set CONFIG_ARC_PLAT_EZNPS=y CONFIG_SMP=y CONFIG_NR_CPUS=4096 |