Commit a5532606 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

[PATCH] ISA DMA Kconfig fixes - part 3

Drivers that expect ISA DMA API are marked as such in Kconfig.
Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7fbacd52
...@@ -105,7 +105,7 @@ config ATARI_SLM ...@@ -105,7 +105,7 @@ config ATARI_SLM
config BLK_DEV_XD config BLK_DEV_XD
tristate "XT hard disk support" tristate "XT hard disk support"
depends on ISA depends on ISA && ISA_DMA_API
help help
Very old 8 bit hard disk controllers used in the IBM XT computer Very old 8 bit hard disk controllers used in the IBM XT computer
will be supported if you say Y here. will be supported if you say Y here.
......
...@@ -153,7 +153,7 @@ config DIGIEPCA ...@@ -153,7 +153,7 @@ config DIGIEPCA
config ESPSERIAL config ESPSERIAL
tristate "Hayes ESP serial port support" 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 help
This is a driver which supports Hayes ESP serial ports. Both single This is a driver which supports Hayes ESP serial ports. Both single
port cards and multiport cards are supported. Make sure to read port cards and multiport cards are supported. Make sure to read
...@@ -195,7 +195,7 @@ config ISI ...@@ -195,7 +195,7 @@ config ISI
config SYNCLINK config SYNCLINK
tristate "Microgate SyncLink card support" tristate "Microgate SyncLink card support"
depends on SERIAL_NONSTANDARD && PCI depends on SERIAL_NONSTANDARD && PCI && ISA_DMA_API
help help
Provides support for the SyncLink ISA and PCI multiprotocol serial Provides support for the SyncLink ISA and PCI multiprotocol serial
adapters. These adapters support asynchronous and HDLC bit adapters. These adapters support asynchronous and HDLC bit
......
...@@ -51,7 +51,7 @@ config MMC_PXA ...@@ -51,7 +51,7 @@ config MMC_PXA
config MMC_WBSD config MMC_WBSD
tristate "Winbond W83L51xD SD/MMC Card Interface support" tristate "Winbond W83L51xD SD/MMC Card Interface support"
depends on MMC && ISA depends on MMC && ISA && ISA_DMA_API
help help
This selects the Winbond(R) W83L51xD Secure digital and This selects the Winbond(R) W83L51xD Secure digital and
Multimedia card Interface. Multimedia card Interface.
......
...@@ -589,7 +589,7 @@ config EL2 ...@@ -589,7 +589,7 @@ config EL2
config ELPLUS config ELPLUS
tristate "3c505 \"EtherLink Plus\" support" tristate "3c505 \"EtherLink Plus\" support"
depends on NET_VENDOR_3COM && ISA depends on NET_VENDOR_3COM && ISA && ISA_DMA_API
---help--- ---help---
Information about this network (Ethernet) card can be found in Information about this network (Ethernet) card can be found in
<file:Documentation/networking/3c505.txt>. If you have a card of <file:Documentation/networking/3c505.txt>. If you have a card of
...@@ -630,7 +630,7 @@ config EL3 ...@@ -630,7 +630,7 @@ config EL3
config 3C515 config 3C515
tristate "3c515 ISA \"Fast EtherLink\"" tristate "3c515 ISA \"Fast EtherLink\""
depends on NET_VENDOR_3COM && (ISA || EISA) depends on NET_VENDOR_3COM && (ISA || EISA) && ISA_DMA_API
help help
If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet
network card, say Y and read the Ethernet-HOWTO, available from network card, say Y and read the Ethernet-HOWTO, available from
...@@ -708,7 +708,7 @@ config TYPHOON ...@@ -708,7 +708,7 @@ config TYPHOON
config LANCE config LANCE
tristate "AMD LANCE and PCnet (AT1500 and NE2100) support" tristate "AMD LANCE and PCnet (AT1500 and NE2100) support"
depends on NET_ETHERNET && ISA depends on NET_ETHERNET && ISA && ISA_DMA_API
help help
If you have a network (Ethernet) card of this type, say Y and read If you have a network (Ethernet) card of this type, say Y and read
the Ethernet-HOWTO, available from the Ethernet-HOWTO, available from
...@@ -864,7 +864,7 @@ config NI52 ...@@ -864,7 +864,7 @@ config NI52
config NI65 config NI65
tristate "NI6510 support" tristate "NI6510 support"
depends on NET_VENDOR_RACAL && ISA depends on NET_VENDOR_RACAL && ISA && ISA_DMA_API
help help
If you have a network (Ethernet) card of this type, say Y and read If you have a network (Ethernet) card of this type, say Y and read
the Ethernet-HOWTO, available from the Ethernet-HOWTO, available from
...@@ -1072,7 +1072,7 @@ config NE2000 ...@@ -1072,7 +1072,7 @@ config NE2000
config ZNET config ZNET
tristate "Zenith Z-Note support (EXPERIMENTAL)" tristate "Zenith Z-Note support (EXPERIMENTAL)"
depends on NET_ISA && EXPERIMENTAL depends on NET_ISA && EXPERIMENTAL && ISA_DMA_API
help help
The Zenith Z-Note notebook computer has a built-in network The Zenith Z-Note notebook computer has a built-in network
(Ethernet) card, and this is the Linux driver for it. Note that the (Ethernet) card, and this is the Linux driver for it. Note that the
......
...@@ -13,7 +13,7 @@ config DEV_APPLETALK ...@@ -13,7 +13,7 @@ config DEV_APPLETALK
config LTPC config LTPC
tristate "Apple/Farallon LocalTalk PC support" tristate "Apple/Farallon LocalTalk PC support"
depends on DEV_APPLETALK && (ISA || EISA) depends on DEV_APPLETALK && (ISA || EISA) && ISA_DMA_API
help help
This allows you to use the AppleTalk PC card to connect to LocalTalk 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. networks. The card is also known as the Farallon PhoneNet PC card.
......
...@@ -45,7 +45,7 @@ config BPQETHER ...@@ -45,7 +45,7 @@ config BPQETHER
config DMASCC config DMASCC
tristate "High-speed (DMA) SCC driver for AX.25" 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--- ---help---
This is a driver for high-speed SCC boards, i.e. those supporting 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 DMA on one port. You usually use those boards to connect your
...@@ -78,7 +78,7 @@ config DMASCC ...@@ -78,7 +78,7 @@ config DMASCC
config SCC config SCC
tristate "Z8530 SCC driver" tristate "Z8530 SCC driver"
depends on ISA && AX25 depends on ISA && AX25 && ISA_DMA_API
---help--- ---help---
These cards are used to connect your Linux box to an amateur radio 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 in order to communicate with other computers. If you want to use
......
...@@ -26,7 +26,7 @@ config WAN ...@@ -26,7 +26,7 @@ config WAN
# There is no way to detect a comtrol sv11 - force it modular for now. # There is no way to detect a comtrol sv11 - force it modular for now.
config HOSTESS_SV11 config HOSTESS_SV11
tristate "Comtrol Hostess SV-11 support" tristate "Comtrol Hostess SV-11 support"
depends on WAN && ISA && m depends on WAN && ISA && m && ISA_DMA_API
help help
Driver for Comtrol Hostess SV-11 network card which Driver for Comtrol Hostess SV-11 network card which
operates on low speed synchronous serial links at up to operates on low speed synchronous serial links at up to
...@@ -38,7 +38,7 @@ config HOSTESS_SV11 ...@@ -38,7 +38,7 @@ config HOSTESS_SV11
# The COSA/SRP driver has not been tested as non-modular yet. # The COSA/SRP driver has not been tested as non-modular yet.
config COSA config COSA
tristate "COSA/SRP sync serial boards support" tristate "COSA/SRP sync serial boards support"
depends on WAN && ISA && m depends on WAN && ISA && m && ISA_DMA_API
---help--- ---help---
Driver for COSA and SRP synchronous serial boards. Driver for COSA and SRP synchronous serial boards.
...@@ -127,7 +127,7 @@ config LANMEDIA ...@@ -127,7 +127,7 @@ config LANMEDIA
# There is no way to detect a Sealevel board. Force it modular # There is no way to detect a Sealevel board. Force it modular
config SEALEVEL_4021 config SEALEVEL_4021
tristate "Sealevel Systems 4021 support" tristate "Sealevel Systems 4021 support"
depends on WAN && ISA && m depends on WAN && ISA && m && ISA_DMA_API
help help
This is a driver for the Sealevel Systems ACB 56 serial I/O adapter. This is a driver for the Sealevel Systems ACB 56 serial I/O adapter.
......
...@@ -260,7 +260,7 @@ config SCSI_3W_9XXX ...@@ -260,7 +260,7 @@ config SCSI_3W_9XXX
config SCSI_7000FASST config SCSI_7000FASST
tristate "7000FASST SCSI support" tristate "7000FASST SCSI support"
depends on ISA && SCSI depends on ISA && SCSI && ISA_DMA_API
help help
This driver supports the Western Digital 7000 SCSI host adapter This driver supports the Western Digital 7000 SCSI host adapter
family. Some information is in the source: family. Some information is in the source:
...@@ -295,7 +295,7 @@ config SCSI_AHA152X ...@@ -295,7 +295,7 @@ config SCSI_AHA152X
config SCSI_AHA1542 config SCSI_AHA1542
tristate "Adaptec AHA1542 support" tristate "Adaptec AHA1542 support"
depends on ISA && SCSI depends on ISA && SCSI && ISA_DMA_API
---help--- ---help---
This is support for a SCSI host adapter. It is explained in section This is support for a SCSI host adapter. It is explained in section
3.4 of the SCSI-HOWTO, available from 3.4 of the SCSI-HOWTO, available from
...@@ -515,7 +515,7 @@ config SCSI_SATA_VITESSE ...@@ -515,7 +515,7 @@ config SCSI_SATA_VITESSE
config SCSI_BUSLOGIC config SCSI_BUSLOGIC
tristate "BusLogic SCSI support" tristate "BusLogic SCSI support"
depends on (PCI || ISA || MCA) && SCSI && (BROKEN || !SPARC64) depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API
---help--- ---help---
This is support for BusLogic MultiMaster and FlashPoint SCSI Host This is support for BusLogic MultiMaster and FlashPoint SCSI Host
Adapters. Consult the SCSI-HOWTO, available from Adapters. Consult the SCSI-HOWTO, available from
...@@ -571,7 +571,7 @@ config SCSI_DTC3280 ...@@ -571,7 +571,7 @@ config SCSI_DTC3280
config SCSI_EATA config SCSI_EATA
tristate "EATA ISA/EISA/PCI (DPT and generic EATA/DMA-compliant boards) support" 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--- ---help---
This driver supports all EATA/DMA-compliant SCSI host adapters. DPT This driver supports all EATA/DMA-compliant SCSI host adapters. DPT
ISA and all EISA I/O addresses are probed looking for the "EATA" ISA and all EISA I/O addresses are probed looking for the "EATA"
...@@ -665,7 +665,7 @@ config SCSI_FD_MCS ...@@ -665,7 +665,7 @@ config SCSI_FD_MCS
config SCSI_GDTH config SCSI_GDTH
tristate "Intel/ICP (former GDT SCSI Disk Array) RAID Controller support" 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--- ---help---
Formerly called GDT SCSI Disk Array Controller Support. Formerly called GDT SCSI Disk Array Controller Support.
...@@ -1416,7 +1416,7 @@ config SCSI_T128 ...@@ -1416,7 +1416,7 @@ config SCSI_T128
config SCSI_U14_34F config SCSI_U14_34F
tristate "UltraStor 14F/34F support" tristate "UltraStor 14F/34F support"
depends on ISA && SCSI depends on ISA && SCSI && ISA_DMA_API
---help--- ---help---
This is support for the UltraStor 14F and 34F SCSI-2 host adapters. This is support for the UltraStor 14F and 34F SCSI-2 host adapters.
The source at <file:drivers/scsi/u14-34f.c> contains some The source at <file:drivers/scsi/u14-34f.c> contains some
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment