diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-30 20:56:47 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-30 20:56:47 +0300 |
| commit | f6c5971bb78ee5c4b9659f2764e58c175b75638c (patch) | |
| tree | c66d73f76980028e26b76028e3438d2e53d25111 /arch/ia64 | |
| parent | 051df241e44693dba8f4e1e74184237f55dd811d (diff) | |
| parent | 094121ef815f29d9e6a01fafca365831454ce293 (diff) | |
| download | linux-f6c5971bb78ee5c4b9659f2764e58c175b75638c.tar.xz | |
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/ia64')
| -rw-r--r-- | arch/ia64/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index cf425c2c63af..4993c7ac7ff6 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -25,7 +25,6 @@ config IA64 select HAVE_ASM_MODVERSIONS select HAVE_UNSTABLE_SCHED_CLOCK select HAVE_EXIT_THREAD - select HAVE_IDE select HAVE_KPROBES select HAVE_KRETPROBES select HAVE_FTRACE_MCOUNT_RECORD |