diff options
-rw-r--r-- | arch/powerpc/Kconfig | 4 | ||||
-rw-r--r-- | drivers/scsi/Kconfig | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 2ae8a46bce98..0db10c2792b2 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -932,10 +932,6 @@ config FSL_GTM | |||
932 | help | 932 | help |
933 | Freescale General-purpose Timers support | 933 | Freescale General-purpose Timers support |
934 | 934 | ||
935 | # Yes MCA RS/6000s exist but Linux-PPC does not currently support any | ||
936 | config MCA | ||
937 | bool | ||
938 | |||
939 | # Platforms that what PCI turned unconditionally just do select PCI | 935 | # Platforms that what PCI turned unconditionally just do select PCI |
940 | # in their config node. Platforms that want to choose at config | 936 | # in their config node. Platforms that want to choose at config |
941 | # time should select PPC_PCI_CHOICE | 937 | # time should select PPC_PCI_CHOICE |
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 70988c381268..f07444d30b21 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
@@ -538,7 +538,7 @@ config SCSI_HPTIOP | |||
538 | 538 | ||
539 | config SCSI_BUSLOGIC | 539 | config SCSI_BUSLOGIC |
540 | tristate "BusLogic SCSI support" | 540 | tristate "BusLogic SCSI support" |
541 | depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API && VIRT_TO_BUS | 541 | depends on (PCI || ISA) && SCSI && ISA_DMA_API && VIRT_TO_BUS |
542 | ---help--- | 542 | ---help--- |
543 | This is support for BusLogic MultiMaster and FlashPoint SCSI Host | 543 | This is support for BusLogic MultiMaster and FlashPoint SCSI Host |
544 | Adapters. Consult the SCSI-HOWTO, available from | 544 | Adapters. Consult the SCSI-HOWTO, available from |
@@ -1175,12 +1175,12 @@ config SCSI_LPFC_DEBUG_FS | |||
1175 | 1175 | ||
1176 | config SCSI_SIM710 | 1176 | config SCSI_SIM710 |
1177 | tristate "Simple 53c710 SCSI support (Compaq, NCR machines)" | 1177 | tristate "Simple 53c710 SCSI support (Compaq, NCR machines)" |
1178 | depends on (EISA || MCA) && SCSI | 1178 | depends on EISA && SCSI |
1179 | select SCSI_SPI_ATTRS | 1179 | select SCSI_SPI_ATTRS |
1180 | ---help--- | 1180 | ---help--- |
1181 | This driver is for NCR53c710 based SCSI host adapters. | 1181 | This driver is for NCR53c710 based SCSI host adapters. |
1182 | 1182 | ||
1183 | It currently supports Compaq EISA cards and NCR MCA cards | 1183 | It currently supports Compaq EISA cards. |
1184 | 1184 | ||
1185 | config SCSI_DC395x | 1185 | config SCSI_DC395x |
1186 | tristate "Tekram DC395(U/UW/F) and DC315(U) SCSI support" | 1186 | tristate "Tekram DC395(U/UW/F) and DC315(U) SCSI support" |