mISDN: add HAS_IOPORT dependencies

In a future patch HAS_IOPORT=n will result in inb()/outb() and friends
not being declared. We thus need to add HAS_IOPORT as dependency for
those drivers using them. With that the !S390 dependency on ISDN can be
removed as all drivers without HAS_IOPORT requirement now build.

Co-developed-by: Arnd Bergmann <arnd@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@kernel.org>
Acked-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
Link: https://lore.kernel.org/r/20230522105049.1467313-21-schnelle@linux.ibm.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig
index 2690e2c..6fd1b3f 100644 (file)
--- a/drivers/isdn/Kconfig
+++ b/drivers/isdn/Kconfig
@@ -6,7 +6,6 @@
 menuconfig ISDN
        bool "ISDN support"
        depends on NET && NETDEVICES
-       depends on !S390 && !UML
        help
          ISDN ("Integrated Services Digital Network", called RNIS in France)
          is a fully digital telephone service that can be used for voice and

diff --git a/drivers/isdn/hardware/mISDN/Kconfig b/drivers/isdn/hardware/mISDN/Kconfig
index 078eead..a35bff8 100644 (file)
--- a/drivers/isdn/hardware/mISDN/Kconfig
+++ b/drivers/isdn/hardware/mISDN/Kconfig
@@ -14,7 +14,7 @@ config MISDN_HFCPCI
 
 config MISDN_HFCMULTI
        tristate "Support for HFC multiport cards (HFC-4S/8S/E1)"
-       depends on PCI || CPM1
+       depends on (PCI || CPM1) && HAS_IOPORT
        depends on MISDN
        help
          Enable support for cards with Cologne Chip AG's HFC multiport
@@ -43,7 +43,7 @@ config MISDN_HFCUSB
 config MISDN_AVMFRITZ
        tristate "Support for AVM FRITZ!CARD PCI"
        depends on MISDN
-       depends on PCI
+       depends on PCI && HAS_IOPORT
        select MISDN_IPAC
        help
          Enable support for AVMs FRITZ!CARD PCI cards
@@ -51,7 +51,7 @@ config MISDN_AVMFRITZ
 config MISDN_SPEEDFAX
        tristate "Support for Sedlbauer Speedfax+"
        depends on MISDN
-       depends on PCI
+       depends on PCI && HAS_IOPORT
        select MISDN_IPAC
        select MISDN_ISAR
        help
@@ -60,7 +60,7 @@ config MISDN_SPEEDFAX
 config MISDN_INFINEON
        tristate "Support for cards with Infineon chipset"
        depends on MISDN
-       depends on PCI
+       depends on PCI && HAS_IOPORT
        select MISDN_IPAC
        help
          Enable support for cards with ISAC + HSCX, IPAC or IPAC-SX
@@ -69,14 +69,14 @@ config MISDN_INFINEON
 config MISDN_W6692
        tristate "Support for cards with Winbond 6692"
        depends on MISDN
-       depends on PCI
+       depends on PCI && HAS_IOPORT
        help
          Enable support for Winbond 6692 PCI chip based cards.
 
 config MISDN_NETJET
        tristate "Support for NETJet cards"
        depends on MISDN
-       depends on PCI
+       depends on PCI && HAS_IOPORT
        depends on TTY
        select MISDN_IPAC
        select MISDN_HDLC