Commit 023ae619 authored by Robert P. J. Day's avatar Robert P. J. Day Committed by James Bottomley

[SCSI] pcmcia: allow drivers to be built non-modular

Remove the Kconfig requirement that the PCMCIA SCSI drivers be built
only as modules, and allow them to be built into the kernel.
Signed-off-by: default avatarRobert P. J. Day <rpjday@mindspring.com>
Acked-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 912d4e88
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
# #
menu "PCMCIA SCSI adapter support" menu "PCMCIA SCSI adapter support"
depends on SCSI!=n && PCMCIA!=n && MODULES depends on SCSI!=n && PCMCIA!=n
config PCMCIA_AHA152X config PCMCIA_AHA152X
tristate "Adaptec AHA152X PCMCIA support" tristate "Adaptec AHA152X PCMCIA support"
depends on m && !64BIT depends on !64BIT
select SCSI_SPI_ATTRS select SCSI_SPI_ATTRS
help help
Say Y here if you intend to attach this type of PCMCIA SCSI host Say Y here if you intend to attach this type of PCMCIA SCSI host
...@@ -18,7 +18,6 @@ config PCMCIA_AHA152X ...@@ -18,7 +18,6 @@ config PCMCIA_AHA152X
config PCMCIA_FDOMAIN config PCMCIA_FDOMAIN
tristate "Future Domain PCMCIA support" tristate "Future Domain PCMCIA support"
depends on m
help help
Say Y here if you intend to attach this type of PCMCIA SCSI host Say Y here if you intend to attach this type of PCMCIA SCSI host
adapter to your computer. adapter to your computer.
...@@ -28,7 +27,7 @@ config PCMCIA_FDOMAIN ...@@ -28,7 +27,7 @@ config PCMCIA_FDOMAIN
config PCMCIA_NINJA_SCSI config PCMCIA_NINJA_SCSI
tristate "NinjaSCSI-3 / NinjaSCSI-32Bi (16bit) PCMCIA support" tristate "NinjaSCSI-3 / NinjaSCSI-32Bi (16bit) PCMCIA support"
depends on m && !64BIT depends on !64BIT
help help
If you intend to attach this type of PCMCIA SCSI host adapter to If you intend to attach this type of PCMCIA SCSI host adapter to
your computer, say Y here and read your computer, say Y here and read
...@@ -62,7 +61,6 @@ config PCMCIA_NINJA_SCSI ...@@ -62,7 +61,6 @@ config PCMCIA_NINJA_SCSI
config PCMCIA_QLOGIC config PCMCIA_QLOGIC
tristate "Qlogic PCMCIA support" tristate "Qlogic PCMCIA support"
depends on m
help help
Say Y here if you intend to attach this type of PCMCIA SCSI host Say Y here if you intend to attach this type of PCMCIA SCSI host
adapter to your computer. adapter to your computer.
...@@ -72,7 +70,6 @@ config PCMCIA_QLOGIC ...@@ -72,7 +70,6 @@ config PCMCIA_QLOGIC
config PCMCIA_SYM53C500 config PCMCIA_SYM53C500
tristate "Symbios 53c500 PCMCIA support" tristate "Symbios 53c500 PCMCIA support"
depends on m
help help
Say Y here if you have a New Media Bus Toaster or other PCMCIA Say Y here if you have a New Media Bus Toaster or other PCMCIA
SCSI adapter based on the Symbios 53c500 controller. SCSI adapter based on the Symbios 53c500 controller.
......
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