Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6fd2807 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Move libata to drivers/ata.

parent 79ed35a9

drivers/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ source "drivers/ide/Kconfig" 


source "drivers/scsi/Kconfig"



source "drivers/ata/Kconfig"



source "drivers/cdrom/Kconfig"



source "drivers/md/Kconfig"

drivers/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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/

drivers/ata/Kconfig

0 → 100644
+140 −0
Original line number Diff line number Diff line 


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

drivers/ata/Makefile

0 → 100644
+19 −0
Original line number Diff line number Diff line 


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

drivers/scsi/ahci.c→drivers/ata/ahci.c

+0 −0

File moved.

View file