diff options
author | Ingo Molnar <mingo@kernel.org> | 2022-09-02 11:31:58 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2022-09-02 11:33:33 +0300 |
commit | 1043897681808118c0f7e70b210774000fe06621 (patch) | |
tree | ec8c0aa114e8585a73b9a7afddf9e6a6f65e992e /arch/microblaze/Kconfig | |
parent | 652c5bf380ad018e15006a7f8349800245ddbbad (diff) | |
parent | 42e66b1cc3a070671001f8a1e933a80818a192bf (diff) | |
download | linux-1043897681808118c0f7e70b210774000fe06621.tar.xz |
Merge branch 'linus' into x86/mm, to refresh the branch
This branch is ~14k commits behind upstream, and has an old merge base
from early into the merge window, refresh it to v6.0-rc3+fixes before
queueing up new commits.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/microblaze/Kconfig')
-rw-r--r-- | arch/microblaze/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index 8cf429ad1c84..996132a5ef35 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig @@ -38,14 +38,12 @@ config MICROBLAZE select OF_EARLY_FLATTREE select PCI_DOMAINS_GENERIC if PCI select PCI_SYSCALL if PCI - select VIRT_TO_BUS select CPU_NO_EFFICIENT_FFS select MMU_GATHER_NO_RANGE select SPARSE_IRQ select ZONE_DMA select TRACE_IRQFLAGS_SUPPORT select GENERIC_IRQ_MULTI_HANDLER - select HANDLE_DOMAIN_IRQ # Endianness selection choice |