Commit f6c5971b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 051df241 094121ef

arch/alpha/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ config ALPHA 
	select PCI_SYSCALL if PCI

	select HAVE_AOUT

	select HAVE_ASM_MODVERSIONS

	select HAVE_IDE

	select HAVE_PCSPKR_PLATFORM

	select HAVE_PERF_EVENTS

	select NEED_DMA_MAP_STATE

arch/arm/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ config ARM 
	select HAVE_FUNCTION_TRACER if !XIP_KERNEL

	select HAVE_GCC_PLUGINS

	select HAVE_HW_BREAKPOINT if PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7)

	select HAVE_IDE if PCI || ISA || PCMCIA

	select HAVE_IRQ_TIME_ACCOUNTING

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_LZ4
@@ -361,7 +360,6 @@ config ARCH_FOOTBRIDGE 
	bool "FootBridge"

	select CPU_SA110

	select FOOTBRIDGE

	select HAVE_IDE

	select NEED_MACH_IO_H if !MMU

	select NEED_MACH_MEMORY_H

	help
@@ -430,7 +428,6 @@ config ARCH_PXA 
	select GENERIC_IRQ_MULTI_HANDLER

	select GPIO_PXA

	select GPIOLIB

	select HAVE_IDE

	select IRQ_DOMAIN

	select PLAT_PXA

	select SPARSE_IRQ
@@ -446,7 +443,6 @@ config ARCH_RPC 
	select ARM_HAS_SG_CHAIN

	select CPU_SA110

	select FIQ

	select HAVE_IDE

	select HAVE_PATA_PLATFORM

	select ISA_DMA_API

	select LEGACY_TIMER_TICK
@@ -469,7 +465,6 @@ config ARCH_SA1100 
	select CPU_SA1100

	select GENERIC_IRQ_MULTI_HANDLER

	select GPIOLIB

	select HAVE_IDE

	select IRQ_DOMAIN

	select ISA

	select NEED_MACH_MEMORY_H
@@ -505,7 +500,6 @@ config ARCH_OMAP1 
	select GENERIC_IRQ_CHIP

	select GENERIC_IRQ_MULTI_HANDLER

	select GPIOLIB

	select HAVE_IDE

	select HAVE_LEGACY_CLK

	select IRQ_DOMAIN

	select NEED_MACH_IO_H if PCCARD

arch/arm/mach-davinci/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ menuconfig ARCH_DAVINCI 
	select PM_GENERIC_DOMAINS_OF if PM && OF

	select REGMAP_MMIO

	select RESET_CONTROLLER

	select HAVE_IDE

	select PINCTRL_SINGLE



if ARCH_DAVINCI

arch/h8300/Kconfig.cpu

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ config H8300_H8MAX 
	bool "H8MAX"

	select H83069

	select RAMKERNEL

	select HAVE_IDE

	help

	  H8MAX Evaluation Board Support

	  More Information. (Japanese Only)

arch/ia64/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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