diff options
| author | Robert P. J. Day <rpjday@mindspring.com> | 2007-03-26 16:06:45 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-04-01 11:07:14 -0400 |
| commit | 023ae6199938fc79a51d2616903b44b07fe338b6 (patch) | |
| tree | 63dc819d2b84ee8cde0433f48f839a7965449f68 /drivers/scsi | |
| parent | 912d4e8851389eee5c289ce0a7953e9067198232 (diff) | |
[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: Robert P. J. Day <rpjday@mindspring.com>
Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/pcmcia/Kconfig | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/scsi/pcmcia/Kconfig b/drivers/scsi/pcmcia/Kconfig index eac8e179cfff..7dd787f6ab27 100644 --- a/drivers/scsi/pcmcia/Kconfig +++ b/drivers/scsi/pcmcia/Kconfig | |||
| @@ -3,11 +3,11 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | menu "PCMCIA SCSI adapter support" | 5 | menu "PCMCIA SCSI adapter support" |
| 6 | depends on SCSI!=n && PCMCIA!=n && MODULES | 6 | depends on SCSI!=n && PCMCIA!=n |
| 7 | 7 | ||
| 8 | config PCMCIA_AHA152X | 8 | config PCMCIA_AHA152X |
| 9 | tristate "Adaptec AHA152X PCMCIA support" | 9 | tristate "Adaptec AHA152X PCMCIA support" |
| 10 | depends on m && !64BIT | 10 | depends on !64BIT |
| 11 | select SCSI_SPI_ATTRS | 11 | select SCSI_SPI_ATTRS |
| 12 | help | 12 | help |
| 13 | Say Y here if you intend to attach this type of PCMCIA SCSI host | 13 | Say Y here if you intend to attach this type of PCMCIA SCSI host |
| @@ -18,7 +18,6 @@ config PCMCIA_AHA152X | |||
| 18 | 18 | ||
| 19 | config PCMCIA_FDOMAIN | 19 | config PCMCIA_FDOMAIN |
| 20 | tristate "Future Domain PCMCIA support" | 20 | tristate "Future Domain PCMCIA support" |
| 21 | depends on m | ||
| 22 | help | 21 | help |
| 23 | Say Y here if you intend to attach this type of PCMCIA SCSI host | 22 | Say Y here if you intend to attach this type of PCMCIA SCSI host |
| 24 | adapter to your computer. | 23 | adapter to your computer. |
| @@ -28,7 +27,7 @@ config PCMCIA_FDOMAIN | |||
| 28 | 27 | ||
| 29 | config PCMCIA_NINJA_SCSI | 28 | config PCMCIA_NINJA_SCSI |
| 30 | tristate "NinjaSCSI-3 / NinjaSCSI-32Bi (16bit) PCMCIA support" | 29 | tristate "NinjaSCSI-3 / NinjaSCSI-32Bi (16bit) PCMCIA support" |
| 31 | depends on m && !64BIT | 30 | depends on !64BIT |
| 32 | help | 31 | help |
| 33 | If you intend to attach this type of PCMCIA SCSI host adapter to | 32 | If you intend to attach this type of PCMCIA SCSI host adapter to |
| 34 | your computer, say Y here and read | 33 | your computer, say Y here and read |
| @@ -62,7 +61,6 @@ config PCMCIA_NINJA_SCSI | |||
| 62 | 61 | ||
| 63 | config PCMCIA_QLOGIC | 62 | config PCMCIA_QLOGIC |
| 64 | tristate "Qlogic PCMCIA support" | 63 | tristate "Qlogic PCMCIA support" |
| 65 | depends on m | ||
| 66 | help | 64 | help |
| 67 | Say Y here if you intend to attach this type of PCMCIA SCSI host | 65 | Say Y here if you intend to attach this type of PCMCIA SCSI host |
| 68 | adapter to your computer. | 66 | adapter to your computer. |
| @@ -72,7 +70,6 @@ config PCMCIA_QLOGIC | |||
| 72 | 70 | ||
| 73 | config PCMCIA_SYM53C500 | 71 | config PCMCIA_SYM53C500 |
| 74 | tristate "Symbios 53c500 PCMCIA support" | 72 | tristate "Symbios 53c500 PCMCIA support" |
| 75 | depends on m | ||
| 76 | help | 73 | help |
| 77 | Say Y here if you have a New Media Bus Toaster or other PCMCIA | 74 | Say Y here if you have a New Media Bus Toaster or other PCMCIA |
| 78 | SCSI adapter based on the Symbios 53c500 controller. | 75 | SCSI adapter based on the Symbios 53c500 controller. |