diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-09-07 16:45:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-09-07 16:45:32 -0700 |
| commit | 2c34a0e041a7063e6e3b3be8866a88975f3342d4 (patch) | |
| tree | 6d80b12246a4f080a9431fda4bcbf4c6d7d396a7 /arch/arc/configs/tb10x_defconfig | |
| parent | ecfe951f0c1b169ea4b7dd6f3a404dfedd795bc2 (diff) | |
| parent | dd45210b6dd4f1512eafcc41774154ebb762360f (diff) | |
| download | linux-2c34a0e041a7063e6e3b3be8866a88975f3342d4.tar.gz | |
Merge tag 'arc-4.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC updates from Vineet Gupta: - Fix for atomic_fetch_#op [Will Deacon] - Enable per device IOC [Eugeniy Paltsev] - Remove redundant gcc version checks [Masahiro Yamada] - Miscll platform config/DT updates [Alexey Brodkin] * tag 'arc-4.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: ARC: don't check for HIGHMEM pages in arch_dma_alloc ARC: IOC: panic if both IOC and ZONE_HIGHMEM enabled ARC: dma [IOC] Enable per device io coherency ARC: dma [IOC]: mark DMA devices connected as dma-coherent ARC: atomics: unbork atomic_fetch_##op() arc: remove redundant GCC version checks ARC: sort Kconfig ARC: cleanup show_faulting_vma() ARC: [plat-axs*]: Enable SWAP ARC: [plat-axs*/plat-hsdk]: Allow U-Boot to pass MAC-address to the kernel ARC: configs: cleanup
Diffstat (limited to 'arch/arc/configs/tb10x_defconfig')
| -rw-r--r-- | arch/arc/configs/tb10x_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arc/configs/tb10x_defconfig b/arch/arc/configs/tb10x_defconfig index 2cc87f909747..a7f65313f84a 100644 --- a/arch/arc/configs/tb10x_defconfig +++ b/arch/arc/configs/tb10x_defconfig @@ -57,7 +57,6 @@ CONFIG_STMMAC_ETH=y # CONFIG_SERIO is not set # CONFIG_VT is not set # CONFIG_LEGACY_PTYS is not set -# CONFIG_DEVKMEM is not set CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=1 |