diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2019-10-29 04:43:29 -0600 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2019-10-29 04:43:29 -0600 |
| commit | 822bbba0cabb50825a0ce22707dc45eb82d02853 (patch) | |
| tree | ea61d4ca72cb60b4cae8e95f64eefa7cd2a36603 /arch/sparc/Kconfig | |
| parent | d41abfd7ae33cd3c1d9189438937d61cb75e690a (diff) | |
| parent | 7d194c2100ad2a6dded545887d02754948ca5241 (diff) | |
Merge tag 'v5.4-rc4' into docs-next
I need to pick up the independent changes made to
Documentation/core-api/memory-allocation.rst to be able to merge further
work without creating a total mess.
Diffstat (limited to 'arch/sparc/Kconfig')
| -rw-r--r-- | arch/sparc/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index fbc1aecf0f94..eb24cb1afc11 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -29,7 +29,6 @@ config SPARC select RTC_DRV_M48T59 select RTC_SYSTOHC select HAVE_ARCH_JUMP_LABEL if SPARC64 - select HAVE_FAST_GUP if SPARC64 select GENERIC_IRQ_SHOW select ARCH_WANT_IPC_PARSE_VERSION select GENERIC_PCI_IOMAP |