summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-08-14 14:12:57 -0400
committerJeff Garzik <jeff@garzik.org>2006-08-14 14:12:57 -0400
commit370ba07eb8324569636bacb47abba79587640d05 (patch)
tree6d0b8ccf5d0f9acc978131490322bd2ce0028090 /drivers/ata
parent8ad92ba7152f40cc31f6f15500c01e4eb39cfed1 (diff)
downloadop-kernel-dev-370ba07eb8324569636bacb47abba79587640d05.zip
op-kernel-dev-370ba07eb8324569636bacb47abba79587640d05.tar.gz
libata: Separate libata.ko build from individual driver builds
Since some SAS drivers need libata, we can no longer use the rule that auto-builds libata.ko as needed. We must instead depend on Kconfig to determine when to build the library kernel module. Noticed by Brian King @ IBM. Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/Makefile32
1 files changed, 17 insertions, 15 deletions
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index b19a773..c17ae9c 100644
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -1,19 +1,21 @@
-obj-$(CONFIG_SATA_AHCI) += libata.o ahci.o
-obj-$(CONFIG_SATA_SVW) += libata.o sata_svw.o
-obj-$(CONFIG_ATA_PIIX) += libata.o ata_piix.o
-obj-$(CONFIG_SATA_PROMISE) += libata.o sata_promise.o
-obj-$(CONFIG_SATA_QSTOR) += libata.o sata_qstor.o
-obj-$(CONFIG_SATA_SIL) += libata.o sata_sil.o
-obj-$(CONFIG_SATA_SIL24) += libata.o sata_sil24.o
-obj-$(CONFIG_SATA_VIA) += libata.o sata_via.o
-obj-$(CONFIG_SATA_VITESSE) += libata.o sata_vsc.o
-obj-$(CONFIG_SATA_SIS) += libata.o sata_sis.o
-obj-$(CONFIG_SATA_SX4) += libata.o sata_sx4.o
-obj-$(CONFIG_SATA_NV) += libata.o sata_nv.o
-obj-$(CONFIG_SATA_ULI) += libata.o sata_uli.o
-obj-$(CONFIG_SATA_MV) += libata.o sata_mv.o
-obj-$(CONFIG_PDC_ADMA) += libata.o pdc_adma.o
+obj-$(CONFIG_ATA) += libata.o
+
+obj-$(CONFIG_SATA_AHCI) += ahci.o
+obj-$(CONFIG_SATA_SVW) += sata_svw.o
+obj-$(CONFIG_ATA_PIIX) += ata_piix.o
+obj-$(CONFIG_SATA_PROMISE) += sata_promise.o
+obj-$(CONFIG_SATA_QSTOR) += sata_qstor.o
+obj-$(CONFIG_SATA_SIL) += sata_sil.o
+obj-$(CONFIG_SATA_SIL24) += sata_sil24.o
+obj-$(CONFIG_SATA_VIA) += sata_via.o
+obj-$(CONFIG_SATA_VITESSE) += sata_vsc.o
+obj-$(CONFIG_SATA_SIS) += sata_sis.o
+obj-$(CONFIG_SATA_SX4) += sata_sx4.o
+obj-$(CONFIG_SATA_NV) += sata_nv.o
+obj-$(CONFIG_SATA_ULI) += sata_uli.o
+obj-$(CONFIG_SATA_MV) += sata_mv.o
+obj-$(CONFIG_PDC_ADMA) += pdc_adma.o
libata-objs := libata-core.o libata-scsi.o libata-bmdma.o libata-eh.o
OpenPOWER on IntegriCloud