diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-21 13:30:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-21 13:30:36 -0700 |
| commit | 05ab303b4f9e7121b120c08081546a25e067b4f4 (patch) | |
| tree | b7e393fce74ff7028e9f67c07a14f1bf41c71322 /arch/arc/configs/nsim_hs_defconfig | |
| parent | 0b3baec853d1de731d2e984f26b92c54842c6ff7 (diff) | |
| parent | a8ec3ee861b6e4e6b82a98777c65510ae63766c1 (diff) | |
| download | linux-0-day-05ab303b4f9e7121b120c08081546a25e067b4f4.tar.gz linux-0-day-05ab303b4f9e7121b120c08081546a25e067b4f4.tar.xz | |
Merge tag 'arc-4.13-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC fixes from Vineet Gupta:
- PAE40 related updates
- SLC errata for region ops
- intc line masking by default
* tag 'arc-4.13-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
arc: Mask individual IRQ lines during core INTC init
ARCv2: PAE40: set MSB even if !CONFIG_ARC_HAS_PAE40 but PAE exists in SoC
ARCv2: PAE40: Explicitly set MSB counterpart of SLC region ops addresses
ARC: dma: implement dma_unmap_page and sg variant
ARCv2: SLC: Make sure busy bit is set properly for region ops
ARC: [plat-sim] Include this platform unconditionally
ARC: [plat-axs10x]: prepare dts files for enabling PAE40 on axs103
ARC: defconfig: Cleanup from old Kconfig options
Diffstat (limited to 'arch/arc/configs/nsim_hs_defconfig')
| -rw-r--r-- | arch/arc/configs/nsim_hs_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arc/configs/nsim_hs_defconfig b/arch/arc/configs/nsim_hs_defconfig index ebe9ebb929333..31ee51b987e7c 100644 --- a/arch/arc/configs/nsim_hs_defconfig +++ b/arch/arc/configs/nsim_hs_defconfig @@ -26,7 +26,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set # CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_CFQ is not set -CONFIG_ARC_PLAT_SIM=y CONFIG_ISA_ARCV2=y CONFIG_ARC_BUILTIN_DTB_NAME="nsim_hs" CONFIG_PREEMPT=y |