diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-06 10:54:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-06 10:54:07 -0700 |
| commit | b62e419707ce082845c34161fe684d0c743b7953 (patch) | |
| tree | 9ecad0aef86a55ca33a0a355c627ff2b4acc4756 /drivers/memory | |
| parent | Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm (diff) | |
| parent | MIPS: SGI-IP27: always enable NUMA in Kconfig (diff) | |
| download | wireguard-linux-b62e419707ce082845c34161fe684d0c743b7953.tar.xz wireguard-linux-b62e419707ce082845c34161fe684d0c743b7953.zip | |
Merge tag 'mips_5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS upates from Thomas Bogendoerfer:
- improvements for Loongson64
- extended ingenic support
- removal of not maintained paravirt system type
- cleanups and fixes
* tag 'mips_5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (81 commits)
MIPS: SGI-IP27: always enable NUMA in Kconfig
MAINTAINERS: Update KVM/MIPS maintainers
MIPS: Update default config file for Loongson-3
MIPS: KVM: Add kvm guest support for Loongson-3
dt-bindings: mips: Document Loongson kvm guest board
MIPS: handle Loongson-specific GSExc exception
MIPS: add definitions for Loongson-specific CP0.Diag1 register
MIPS: only register FTLBPar exception handler for supported models
MIPS: ingenic: Hardcode mem size for qi,lb60 board
MIPS: DTS: ingenic/qi,lb60: Add model and memory node
MIPS: ingenic: Use fw_passed_dtb even if CONFIG_BUILTIN_DTB
MIPS: head.S: Init fw_passed_dtb to builtin DTB
of: address: Fix parser address/size cells initialization
of_address: Guard of_bus_pci_get_flags with CONFIG_PCI
MIPS: DTS: Fix number of msi vectors for Loongson64G
MIPS: Loongson64: Add ISA node for LS7A PCH
MIPS: Loongson64: DTS: Fix ISA and PCI I/O ranges for RS780E PCH
MIPS: Loongson64: Enlarge IO_SPACE_LIMIT
MIPS: Loongson64: Process ISA Node in DeviceTree
of_address: Add bus type match for pci ranges parser
...
Diffstat (limited to 'drivers/memory')
| -rw-r--r-- | drivers/memory/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/memory/Kconfig b/drivers/memory/Kconfig index 00060bdbf574..97440af499b0 100644 --- a/drivers/memory/Kconfig +++ b/drivers/memory/Kconfig @@ -147,7 +147,6 @@ config FSL_IFC config JZ4780_NEMC bool "Ingenic JZ4780 SoC NEMC driver" - default y depends on MIPS || COMPILE_TEST depends on HAS_IOMEM && OF help |