diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-30 10:56:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-30 10:56:47 -0700 |
| commit | f6c5971bb78ee5c4b9659f2764e58c175b75638c (patch) | |
| tree | c66d73f76980028e26b76028e3438d2e53d25111 /arch/sh | |
| parent | 051df241e44693dba8f4e1e74184237f55dd811d (diff) | |
| parent | 094121ef815f29d9e6a01fafca365831454ce293 (diff) | |
| download | linux-f6c5971bb78ee5c4b9659f2764e58c175b75638c.tar.bz2 | |
Merge tag 'libata-5.14-2021-07-30' of git://git.kernel.dk/linux-block
Pull libata fixlets from Jens Axboe:
- A fix for PIO highmem (Christoph)
- Kill HAVE_IDE as it's now unused (Lukas)
* tag 'libata-5.14-2021-07-30' of git://git.kernel.dk/linux-block:
arch: Kconfig: clean up obsolete use of HAVE_IDE
libata: fix ata_pio_sector for CONFIG_HIGHMEM
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 45a0549421cd..b683b69a4556 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -39,7 +39,6 @@ config SUPERH select HAVE_FUTEX_CMPXCHG if FUTEX select HAVE_FTRACE_MCOUNT_RECORD select HAVE_HW_BREAKPOINT - select HAVE_IDE if HAS_IOPORT_MAP select HAVE_IOREMAP_PROT if MMU && !X2TLB select HAVE_KERNEL_BZIP2 select HAVE_KERNEL_GZIP |