Move libata to drivers/ata.

1 files changed, 0 insertions, 138 deletions

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 96a81cd17617..2df4d15c9634 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -471,67 +471,6 @@ config SCSI_IN2000
 
 source "drivers/scsi/megaraid/Kconfig.megaraid"
 
-config SCSI_SATA
-        tristate "Serial ATA (SATA) support"
-        depends on SCSI
-        help
-          This driver family supports Serial ATA host controllers
-          and devices.
-
-          If unsure, say N.
-
-config SCSI_SATA_AHCI
-        tristate "AHCI SATA support"
-        depends on SCSI_SATA && PCI
-        help
-          This option enables support for AHCI Serial ATA.
-
-          If unsure, say N.
-
-config SCSI_SATA_SVW
-        tristate "ServerWorks Frodo / Apple K2 SATA support"
-        depends on SCSI_SATA && PCI
-        help
-          This option enables support for Broadcom/Serverworks/Apple K2
-          SATA support.
-
-          If unsure, say N.
-
-config SCSI_ATA_PIIX
-        tristate "Intel PIIX/ICH SATA support"
-        depends on SCSI_SATA && PCI
-        help
-          This option enables support for ICH5/6/7/8 Serial ATA.
-          If PATA support was enabled previously, this enables
-          support for select Intel PIIX/ICH PATA host controllers.
-
-          If unsure, say N.
-
-config SCSI_SATA_MV
-        tristate "Marvell SATA support (HIGHLY EXPERIMENTAL)"
-        depends on SCSI_SATA && PCI && EXPERIMENTAL
-        help
-          This option enables support for the Marvell Serial ATA family.
-          Currently supports 88SX[56]0[48][01] chips.
-
-          If unsure, say N.
-
-config SCSI_SATA_NV
-        tristate "NVIDIA SATA support"
-        depends on SCSI_SATA && PCI && EXPERIMENTAL
-        help
-          This option enables support for NVIDIA Serial ATA.
-
-          If unsure, say N.
-
-config SCSI_PDC_ADMA
-        tristate "Pacific Digital ADMA support"
-        depends on SCSI_SATA && PCI
-        help
-          This option enables support for Pacific Digital ADMA controllers
-
-          If unsure, say N.
-
 config SCSI_HPTIOP
         tristate "HighPoint RocketRAID 3xxx Controller support"
         depends on SCSI && PCI
@@ -542,83 +481,6 @@ config SCSI_HPTIOP
           To compile this driver as a module, choose M here; the module
           will be called hptiop. If unsure, say N.
 
-config SCSI_SATA_QSTOR
-        tristate "Pacific Digital SATA QStor support"
-        depends on SCSI_SATA && PCI
-        help
-          This option enables support for Pacific Digital Serial ATA QStor.
-
-          If unsure, say N.
-
-config SCSI_SATA_PROMISE
-        tristate "Promise SATA TX2/TX4 support"
-        depends on SCSI_SATA && PCI
-        help
-          This option enables support for Promise Serial ATA TX2/TX4.
-
-          If unsure, say N.
-
-config SCSI_SATA_SX4
-        tristate "Promise SATA SX4 support"
-        depends on SCSI_SATA && PCI && EXPERIMENTAL
-        help
-          This option enables support for Promise Serial ATA SX4.
-
-          If unsure, say N.
-
-config SCSI_SATA_SIL
-        tristate "Silicon Image SATA support"
-        depends on SCSI_SATA && PCI && EXPERIMENTAL
-        help
-          This option enables support for Silicon Image Serial ATA.
-
-          If unsure, say N.
-
-config SCSI_SATA_SIL24
-        tristate "Silicon Image 3124/3132 SATA support"
-        depends on SCSI_SATA && PCI && EXPERIMENTAL
-        help
-          This option enables support for Silicon Image 3124/3132 Serial ATA.
-
-          If unsure, say N.
-
-config SCSI_SATA_SIS
-        tristate "SiS 964/180 SATA support"
-        depends on SCSI_SATA && PCI && EXPERIMENTAL
-        help
-          This option enables support for SiS Serial ATA 964/180.
-
-          If unsure, say N.
-
-config SCSI_SATA_ULI
-        tristate "ULi Electronics SATA support"
-        depends on SCSI_SATA && PCI && EXPERIMENTAL
-        help
-          This option enables support for ULi Electronics SATA.
-
-          If unsure, say N.
-
-config SCSI_SATA_VIA
-        tristate "VIA SATA support"
-        depends on SCSI_SATA && PCI
-        help
-          This option enables support for VIA Serial ATA.
-
-          If unsure, say N.
-
-config SCSI_SATA_VITESSE
-        tristate "VITESSE VSC-7174 / INTEL 31244 SATA support"
-        depends on SCSI_SATA && PCI
-        help
-          This option enables support for Vitesse VSC7174 and Intel 31244 Serial ATA.
-
-          If unsure, say N.
-
-config SCSI_SATA_INTEL_COMBINED
-        bool
-        depends on IDE=y && !BLK_DEV_IDE_SATA && (SCSI_SATA_AHCI || SCSI_ATA_PIIX)
-        default y
-
 config SCSI_BUSLOGIC
         tristate "BusLogic SCSI support"
         depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API