Move libata to drivers/ata.

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 8b11cebe65df5ad396f8fb975e158466f9dd859b..263e86ddc1a4d0740b3e524ced6703d3a991f3d2 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -18,6 +18,8 @@ source "drivers/ide/Kconfig"
 
 source "drivers/scsi/Kconfig"
 
+source "drivers/ata/Kconfig"
+
 source "drivers/cdrom/Kconfig"
 
 source "drivers/md/Kconfig"

diff --git a/drivers/Makefile b/drivers/Makefile
index fc2d744a4e4a75e3960589df663a84650c9a85b7..4ac14dab3079f8b8910a19d733d1ba2692d41c0b 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -34,6 +34,7 @@ obj-$(CONFIG_PPC_PMAC)                += macintosh/
 obj-$(CONFIG_IDE)              += ide/
 obj-$(CONFIG_FC4)              += fc4/
 obj-$(CONFIG_SCSI)             += scsi/
+obj-$(CONFIG_ATA)              += ata/
 obj-$(CONFIG_FUSION)           += message/
 obj-$(CONFIG_IEEE1394)         += ieee1394/
 obj-y                          += cdrom/

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
new file mode 100644 (file)
index 0000000..95d6b41
--- /dev/null
+++ b/drivers/ata/Kconfig
@@ -0,0 +1,140 @@
+
+config ATA
+       tristate "ATA device support"
+       depends on SCSI
+       ---help---
+         If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or
+         any other ATA device under Linux, say Y and make sure that you know
+         the name of your ATA host adapter (the card inside your computer
+         that "speaks" the ATA protocol, also called ATA controller),
+         because you will be asked for it.
+
+config SCSI_SATA_AHCI
+       tristate "AHCI SATA support"
+       depends on ATA && 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 ATA && 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 ATA && 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 ATA && 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 ATA && PCI
+       help
+         This option enables support for NVIDIA Serial ATA.
+
+         If unsure, say N.
+
+config SCSI_PDC_ADMA
+       tristate "Pacific Digital ADMA support"
+       depends on ATA && PCI
+       help
+         This option enables support for Pacific Digital ADMA controllers
+
+         If unsure, say N.
+
+config SCSI_SATA_QSTOR
+       tristate "Pacific Digital SATA QStor support"
+       depends on ATA && 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 ATA && 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 ATA && 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 ATA && PCI
+       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 ATA && PCI
+       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 ATA && PCI
+       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 ATA && PCI
+       help
+         This option enables support for ULi Electronics SATA.
+
+         If unsure, say N.
+
+config SCSI_SATA_VIA
+       tristate "VIA SATA support"
+       depends on ATA && 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 ATA && 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
+

diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
new file mode 100644 (file)
index 0000000..60bdb7b
--- /dev/null
+++ b/drivers/ata/Makefile
@@ -0,0 +1,19 @@
+
+obj-$(CONFIG_SCSI_SATA_AHCI)   += libata.o ahci.o
+obj-$(CONFIG_SCSI_SATA_SVW)    += libata.o sata_svw.o
+obj-$(CONFIG_SCSI_ATA_PIIX)    += libata.o ata_piix.o
+obj-$(CONFIG_SCSI_SATA_PROMISE)        += libata.o sata_promise.o
+obj-$(CONFIG_SCSI_SATA_QSTOR)  += libata.o sata_qstor.o
+obj-$(CONFIG_SCSI_SATA_SIL)    += libata.o sata_sil.o
+obj-$(CONFIG_SCSI_SATA_SIL24)  += libata.o sata_sil24.o
+obj-$(CONFIG_SCSI_SATA_VIA)    += libata.o sata_via.o
+obj-$(CONFIG_SCSI_SATA_VITESSE)        += libata.o sata_vsc.o
+obj-$(CONFIG_SCSI_SATA_SIS)    += libata.o sata_sis.o
+obj-$(CONFIG_SCSI_SATA_SX4)    += libata.o sata_sx4.o
+obj-$(CONFIG_SCSI_SATA_NV)     += libata.o sata_nv.o
+obj-$(CONFIG_SCSI_SATA_ULI)    += libata.o sata_uli.o
+obj-$(CONFIG_SCSI_SATA_MV)     += libata.o sata_mv.o
+obj-$(CONFIG_SCSI_PDC_ADMA)    += libata.o pdc_adma.o
+
+libata-objs    := libata-core.o libata-scsi.o libata-bmdma.o libata-eh.o
+

diff --git a/drivers/scsi/ahci.c b/drivers/ata/ahci.c
similarity index 100%
rename from drivers/scsi/ahci.c
rename to drivers/ata/ahci.c

diff --git a/drivers/scsi/ata_piix.c b/drivers/ata/ata_piix.c
similarity index 100%
rename from drivers/scsi/ata_piix.c
rename to drivers/ata/ata_piix.c

diff --git a/drivers/scsi/libata-bmdma.c b/drivers/ata/libata-bmdma.c
similarity index 100%
rename from drivers/scsi/libata-bmdma.c
rename to drivers/ata/libata-bmdma.c

diff --git a/drivers/scsi/libata-core.c b/drivers/ata/libata-core.c
similarity index 99%
rename from drivers/scsi/libata-core.c
rename to drivers/ata/libata-core.c
index 3f963f206d4a803ce338de85c995d829d0799270..7d786fba4d82dee67f55c72eb3114b7e087886ec 100644 (file)
--- a/drivers/scsi/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -50,7 +50,6 @@
 #include <linux/jiffies.h>
 #include <linux/scatterlist.h>
 #include <scsi/scsi.h>
-#include "scsi_priv.h"
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>

diff --git a/drivers/scsi/libata-eh.c b/drivers/ata/libata-eh.c
similarity index 99%
rename from drivers/scsi/libata-eh.c
rename to drivers/ata/libata-eh.c
index 29f59345305d93e7181ad599594710b22963792f..2c476eee463f929dadc333a81a3c9cb39c258401 100644 (file)
--- a/drivers/scsi/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -39,7 +39,7 @@
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_cmnd.h>
-#include "scsi_transport_api.h"
+#include "../scsi/scsi_transport_api.h"
 
 #include <linux/libata.h>
 

diff --git a/drivers/scsi/libata-scsi.c b/drivers/ata/libata-scsi.c
similarity index 100%
rename from drivers/scsi/libata-scsi.c
rename to drivers/ata/libata-scsi.c

diff --git a/drivers/scsi/libata.h b/drivers/ata/libata.h
similarity index 100%
rename from drivers/scsi/libata.h
rename to drivers/ata/libata.h

diff --git a/drivers/scsi/pdc_adma.c b/drivers/ata/pdc_adma.c
similarity index 100%
rename from drivers/scsi/pdc_adma.c
rename to drivers/ata/pdc_adma.c

diff --git a/drivers/scsi/sata_mv.c b/drivers/ata/sata_mv.c
similarity index 100%
rename from drivers/scsi/sata_mv.c
rename to drivers/ata/sata_mv.c

diff --git a/drivers/scsi/sata_nv.c b/drivers/ata/sata_nv.c
similarity index 100%
rename from drivers/scsi/sata_nv.c
rename to drivers/ata/sata_nv.c

diff --git a/drivers/scsi/sata_promise.c b/drivers/ata/sata_promise.c
similarity index 100%
rename from drivers/scsi/sata_promise.c
rename to drivers/ata/sata_promise.c

diff --git a/drivers/scsi/sata_promise.h b/drivers/ata/sata_promise.h
similarity index 100%
rename from drivers/scsi/sata_promise.h
rename to drivers/ata/sata_promise.h

diff --git a/drivers/scsi/sata_qstor.c b/drivers/ata/sata_qstor.c
similarity index 100%
rename from drivers/scsi/sata_qstor.c
rename to drivers/ata/sata_qstor.c

diff --git a/drivers/scsi/sata_sil.c b/drivers/ata/sata_sil.c
similarity index 100%
rename from drivers/scsi/sata_sil.c
rename to drivers/ata/sata_sil.c

diff --git a/drivers/scsi/sata_sil24.c b/drivers/ata/sata_sil24.c
similarity index 100%
rename from drivers/scsi/sata_sil24.c
rename to drivers/ata/sata_sil24.c

diff --git a/drivers/scsi/sata_sis.c b/drivers/ata/sata_sis.c
similarity index 100%
rename from drivers/scsi/sata_sis.c
rename to drivers/ata/sata_sis.c

diff --git a/drivers/scsi/sata_svw.c b/drivers/ata/sata_svw.c
similarity index 100%
rename from drivers/scsi/sata_svw.c
rename to drivers/ata/sata_svw.c

diff --git a/drivers/scsi/sata_sx4.c b/drivers/ata/sata_sx4.c
similarity index 100%
rename from drivers/scsi/sata_sx4.c
rename to drivers/ata/sata_sx4.c

diff --git a/drivers/scsi/sata_uli.c b/drivers/ata/sata_uli.c
similarity index 100%
rename from drivers/scsi/sata_uli.c
rename to drivers/ata/sata_uli.c

diff --git a/drivers/scsi/sata_via.c b/drivers/ata/sata_via.c
similarity index 100%
rename from drivers/scsi/sata_via.c
rename to drivers/ata/sata_via.c

diff --git a/drivers/scsi/sata_vsc.c b/drivers/ata/sata_vsc.c
similarity index 100%
rename from drivers/scsi/sata_vsc.c
rename to drivers/ata/sata_vsc.c

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 96a81cd17617aaa95fe7bad50875488182f65081..2df4d15c963432624c1e05c61d8a5ed0bd0e153d 100644 (file)
--- 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

diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index ebd0cf00bf3e6a9f359f3765d0adc592a72a6ef6..b678f957cfe2c424f8564dce935df8d51b83f92f 100644 (file)
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -122,21 +122,6 @@ obj-$(CONFIG_SCSI_LASI700) += 53c700.o lasi700.o
 obj-$(CONFIG_SCSI_NSP32)       += nsp32.o
 obj-$(CONFIG_SCSI_IPR)         += ipr.o
 obj-$(CONFIG_SCSI_IBMVSCSI)    += ibmvscsi/
-obj-$(CONFIG_SCSI_SATA_AHCI)   += libata.o ahci.o
-obj-$(CONFIG_SCSI_SATA_SVW)    += libata.o sata_svw.o
-obj-$(CONFIG_SCSI_ATA_PIIX)    += libata.o ata_piix.o
-obj-$(CONFIG_SCSI_SATA_PROMISE)        += libata.o sata_promise.o
-obj-$(CONFIG_SCSI_SATA_QSTOR)  += libata.o sata_qstor.o
-obj-$(CONFIG_SCSI_SATA_SIL)    += libata.o sata_sil.o
-obj-$(CONFIG_SCSI_SATA_SIL24)  += libata.o sata_sil24.o
-obj-$(CONFIG_SCSI_SATA_VIA)    += libata.o sata_via.o
-obj-$(CONFIG_SCSI_SATA_VITESSE)        += libata.o sata_vsc.o
-obj-$(CONFIG_SCSI_SATA_SIS)    += libata.o sata_sis.o
-obj-$(CONFIG_SCSI_SATA_SX4)    += libata.o sata_sx4.o
-obj-$(CONFIG_SCSI_SATA_NV)     += libata.o sata_nv.o
-obj-$(CONFIG_SCSI_SATA_ULI)    += libata.o sata_uli.o
-obj-$(CONFIG_SCSI_SATA_MV)     += libata.o sata_mv.o
-obj-$(CONFIG_SCSI_PDC_ADMA)    += libata.o pdc_adma.o
 obj-$(CONFIG_SCSI_HPTIOP)      += hptiop.o
 
 obj-$(CONFIG_ARM)              += arm/
@@ -166,7 +151,6 @@ ncr53c8xx-flags-$(CONFIG_SCSI_ZALON) \
 CFLAGS_ncr53c8xx.o     := $(ncr53c8xx-flags-y) $(ncr53c8xx-flags-m)
 zalon7xx-objs  := zalon.o ncr53c8xx.o
 NCR_Q720_mod-objs      := NCR_Q720.o ncr53c8xx.o
-libata-objs    := libata-core.o libata-scsi.o libata-bmdma.o libata-eh.o
 oktagon_esp_mod-objs   := oktagon_esp.o oktagon_io.o
 
 # Files generated that shall be removed upon make clean