summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2023-04-05 23:20:00 +0300
committerArnd Bergmann <arnd@arndb.de>2023-04-05 23:20:00 +0300
commit73afb20716e163cdaf662af30d3597aeaacc6a0b (patch)
tree2b37c7be8260aa3ca1df209c1a8ded4535964da2 /drivers
parentbd81feb8cdbf0d9df27301c8fabbbd538519e8b3 (diff)
parentfcbfe8121a45152a3cfbe1c28c96a3b611b7347d (diff)
downloadlinux-73afb20716e163cdaf662af30d3597aeaacc6a0b.tar.xz
Merge branch 'asm-generic-io' into asm-generic
* asm-generic-io: Kconfig: introduce HAS_IOPORT option and select it as necessary
Diffstat (limited to 'drivers')
-rw-r--r--drivers/bus/Kconfig2
-rw-r--r--drivers/parisc/Kconfig1
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig
index 7bfe998f3514..fcfa280df98a 100644
--- a/drivers/bus/Kconfig
+++ b/drivers/bus/Kconfig
@@ -81,7 +81,7 @@ config MOXTET
config HISILICON_LPC
bool "Support for ISA I/O space on HiSilicon Hip06/7"
depends on (ARM64 && ARCH_HISI) || (COMPILE_TEST && !ALPHA && !HEXAGON && !PARISC)
- depends on HAS_IOMEM
+ depends on HAS_IOPORT
select INDIRECT_PIO if ARM64
help
Driver to enable I/O access to devices attached to the Low Pin
diff --git a/drivers/parisc/Kconfig b/drivers/parisc/Kconfig
index 9eb2c1b5de7d..2fc3222d2634 100644
--- a/drivers/parisc/Kconfig
+++ b/drivers/parisc/Kconfig
@@ -4,6 +4,7 @@ menu "Bus options (PCI, PCMCIA, EISA, GSC, ISA)"
config GSC
bool "VSC/GSC/HSC bus support"
select HAVE_EISA
+ select HAS_IOPORT
default y
help
The VSC, GSC and HSC busses were used from the earliest 700-series