[PATCH] ISA DMA Kconfig fixes - part 3

Drivers that expect ISA DMA API are marked as such in Kconfig.

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index e43e02328968728a5f9da232f69ea1ed2edc5770..b594768b0241f3d198d802ada4d192b356677310 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -105,7 +105,7 @@ config ATARI_SLM
 
 config BLK_DEV_XD
        tristate "XT hard disk support"
-       depends on ISA
+       depends on ISA && ISA_DMA_API
        help
          Very old 8 bit hard disk controllers used in the IBM XT computer
          will be supported if you say Y here.

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index e162dab64ffd20402e93e8f60ed038e952299bec..2d5a19f6378d3c4cf49484986bec545dad4c3e63 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -153,7 +153,7 @@ config DIGIEPCA
 
 config ESPSERIAL
        tristate "Hayes ESP serial port support"
-       depends on SERIAL_NONSTANDARD && ISA && BROKEN_ON_SMP
+       depends on SERIAL_NONSTANDARD && ISA && BROKEN_ON_SMP && ISA_DMA_API
        help
          This is a driver which supports Hayes ESP serial ports.  Both single
          port cards and multiport cards are supported.  Make sure to read
@@ -195,7 +195,7 @@ config ISI
 
 config SYNCLINK
        tristate "Microgate SyncLink card support"
-       depends on SERIAL_NONSTANDARD && PCI
+       depends on SERIAL_NONSTANDARD && PCI && ISA_DMA_API
        help
          Provides support for the SyncLink ISA and PCI multiprotocol serial
          adapters. These adapters support asynchronous and HDLC bit

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 72f2b466b8167a0b35f35d2a1e00897d3c029a21..2e70d74fbdee2d8bffa3a7a4d01de57061d317a1 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -51,7 +51,7 @@ config MMC_PXA
 
 config MMC_WBSD
        tristate "Winbond W83L51xD SD/MMC Card Interface support"
-       depends on MMC && ISA
+       depends on MMC && ISA && ISA_DMA_API
        help
          This selects the Winbond(R) W83L51xD Secure digital and
           Multimedia card Interface.

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 68242bda4b9cd2dabd292dc393078b7fc615d7bf..3a0a55b62aaff83280434ee5a493f4fc1b5a2a36 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -589,7 +589,7 @@ config EL2
 
 config ELPLUS
        tristate "3c505 \"EtherLink Plus\" support"
-       depends on NET_VENDOR_3COM && ISA
+       depends on NET_VENDOR_3COM && ISA && ISA_DMA_API
        ---help---
          Information about this network (Ethernet) card can be found in
          <file:Documentation/networking/3c505.txt>.  If you have a card of
@@ -630,7 +630,7 @@ config EL3
 
 config 3C515
        tristate "3c515 ISA \"Fast EtherLink\""
-       depends on NET_VENDOR_3COM && (ISA || EISA)
+       depends on NET_VENDOR_3COM && (ISA || EISA) && ISA_DMA_API
        help
          If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet
          network card, say Y and read the Ethernet-HOWTO, available from
@@ -708,7 +708,7 @@ config TYPHOON
 
 config LANCE
        tristate "AMD LANCE and PCnet (AT1500 and NE2100) support"
-       depends on NET_ETHERNET && ISA
+       depends on NET_ETHERNET && ISA && ISA_DMA_API
        help
          If you have a network (Ethernet) card of this type, say Y and read
          the Ethernet-HOWTO, available from
@@ -864,7 +864,7 @@ config NI52
 
 config NI65
        tristate "NI6510 support"
-       depends on NET_VENDOR_RACAL && ISA
+       depends on NET_VENDOR_RACAL && ISA && ISA_DMA_API
        help
          If you have a network (Ethernet) card of this type, say Y and read
          the Ethernet-HOWTO, available from
@@ -1072,7 +1072,7 @@ config NE2000
 
 config ZNET
        tristate "Zenith Z-Note support (EXPERIMENTAL)"
-       depends on NET_ISA && EXPERIMENTAL
+       depends on NET_ISA && EXPERIMENTAL && ISA_DMA_API
        help
          The Zenith Z-Note notebook computer has a built-in network
          (Ethernet) card, and this is the Linux driver for it. Note that the

diff --git a/drivers/net/appletalk/Kconfig b/drivers/net/appletalk/Kconfig
index 60b19679ca5c7b8a0db1a73f3e2d342dac43a2f5..69c488d933a2bb799d8e5c9853cb262358a75e9f 100644 (file)
--- a/drivers/net/appletalk/Kconfig
+++ b/drivers/net/appletalk/Kconfig
@@ -13,7 +13,7 @@ config DEV_APPLETALK
 
 config LTPC
        tristate "Apple/Farallon LocalTalk PC support"
-       depends on DEV_APPLETALK && (ISA || EISA)
+       depends on DEV_APPLETALK && (ISA || EISA) && ISA_DMA_API
        help
          This allows you to use the AppleTalk PC card to connect to LocalTalk
          networks. The card is also known as the Farallon PhoneNet PC card.

diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig
index 34068f81d45ef1c2d200ed77b661b7b341118046..7cdebe1a0b6198264f06cbb13020132d41ca40d4 100644 (file)
--- a/drivers/net/hamradio/Kconfig
+++ b/drivers/net/hamradio/Kconfig
@@ -45,7 +45,7 @@ config BPQETHER
 
 config DMASCC
        tristate "High-speed (DMA) SCC driver for AX.25"
-       depends on ISA && AX25 && BROKEN_ON_SMP
+       depends on ISA && AX25 && BROKEN_ON_SMP && ISA_DMA_API
        ---help---
          This is a driver for high-speed SCC boards, i.e. those supporting
          DMA on one port. You usually use those boards to connect your
@@ -78,7 +78,7 @@ config DMASCC
 
 config SCC
        tristate "Z8530 SCC driver"
-       depends on ISA && AX25
+       depends on ISA && AX25 && ISA_DMA_API
        ---help---
          These cards are used to connect your Linux box to an amateur radio
          in order to communicate with other computers. If you want to use

diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index 35791934a602e3f2dd9371fe3b7548c2f38f6920..66b94668ddd8a69241d2535ce4726cc74f4d92f2 100644 (file)
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -26,7 +26,7 @@ config WAN
 # There is no way to detect a comtrol sv11 - force it modular for now.
 config HOSTESS_SV11
        tristate "Comtrol Hostess SV-11 support"
-       depends on WAN && ISA && m
+       depends on WAN && ISA && m && ISA_DMA_API
        help
          Driver for Comtrol Hostess SV-11 network card which
          operates on low speed synchronous serial links at up to
@@ -38,7 +38,7 @@ config HOSTESS_SV11
 # The COSA/SRP driver has not been tested as non-modular yet.
 config COSA
        tristate "COSA/SRP sync serial boards support"
-       depends on WAN && ISA && m
+       depends on WAN && ISA && m && ISA_DMA_API
        ---help---
          Driver for COSA and SRP synchronous serial boards.
 
@@ -127,7 +127,7 @@ config LANMEDIA
 # There is no way to detect a Sealevel board. Force it modular
 config SEALEVEL_4021
        tristate "Sealevel Systems 4021 support"
-       depends on WAN && ISA && m
+       depends on WAN && ISA && m && ISA_DMA_API
        help
          This is a driver for the Sealevel Systems ACB 56 serial I/O adapter.
 

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 750b11cefd934349480d6237f6df564edf6d297b..1811cb240315a33c8aea5ddf9d6ccd24c5c51060 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -260,7 +260,7 @@ config SCSI_3W_9XXX
 
 config SCSI_7000FASST
        tristate "7000FASST SCSI support"
-       depends on ISA && SCSI
+       depends on ISA && SCSI && ISA_DMA_API
        help
          This driver supports the Western Digital 7000 SCSI host adapter
          family.  Some information is in the source:
@@ -295,7 +295,7 @@ config SCSI_AHA152X
 
 config SCSI_AHA1542
        tristate "Adaptec AHA1542 support"
-       depends on ISA && SCSI
+       depends on ISA && SCSI && ISA_DMA_API
        ---help---
          This is support for a SCSI host adapter.  It is explained in section
          3.4 of the SCSI-HOWTO, available from
@@ -515,7 +515,7 @@ config SCSI_SATA_VITESSE
 
 config SCSI_BUSLOGIC
        tristate "BusLogic SCSI support"
-       depends on (PCI || ISA || MCA) && SCSI && (BROKEN || !SPARC64)
+       depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API
        ---help---
          This is support for BusLogic MultiMaster and FlashPoint SCSI Host
          Adapters. Consult the SCSI-HOWTO, available from
@@ -571,7 +571,7 @@ config SCSI_DTC3280
 
 config SCSI_EATA
        tristate "EATA ISA/EISA/PCI (DPT and generic EATA/DMA-compliant boards) support"
-       depends on (ISA || EISA || PCI) && SCSI && (BROKEN || !SPARC64)
+       depends on (ISA || EISA || PCI) && SCSI && ISA_DMA_API
        ---help---
          This driver supports all EATA/DMA-compliant SCSI host adapters.  DPT
          ISA and all EISA I/O addresses are probed looking for the "EATA"
@@ -665,7 +665,7 @@ config SCSI_FD_MCS
 
 config SCSI_GDTH
        tristate "Intel/ICP (former GDT SCSI Disk Array) RAID Controller support"
-       depends on (ISA || EISA || PCI) && SCSI && (BROKEN || !SPARC64)
+       depends on (ISA || EISA || PCI) && SCSI && ISA_DMA_API
        ---help---
          Formerly called GDT SCSI Disk Array Controller Support.
 
@@ -1416,7 +1416,7 @@ config SCSI_T128
 
 config SCSI_U14_34F
        tristate "UltraStor 14F/34F support"
-       depends on ISA && SCSI
+       depends on ISA && SCSI && ISA_DMA_API
        ---help---
          This is support for the UltraStor 14F and 34F SCSI-2 host adapters.
          The source at <file:drivers/scsi/u14-34f.c> contains some