Merge commit 'origin/master' into next

[linux-2.6-block.git] / drivers / ata / Makefile

diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index e439141d423ed8856e35cf27865c78bc0bf459ac..fc936d4471d62bb70dbf8431919c7576479a15ac 100644 (file)
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -64,6 +64,7 @@ obj-$(CONFIG_PATA_RZ1000)     += pata_rz1000.o
 obj-$(CONFIG_PATA_SC1200)      += pata_sc1200.o
 obj-$(CONFIG_PATA_SERVERWORKS) += pata_serverworks.o
 obj-$(CONFIG_PATA_SIL680)      += pata_sil680.o
+obj-$(CONFIG_PATA_TOSHIBA)     += pata_piccolo.o
 obj-$(CONFIG_PATA_VIA)         += pata_via.o
 obj-$(CONFIG_PATA_WINBOND)     += pata_sl82c105.o
 obj-$(CONFIG_PATA_WINBOND_VLB) += pata_winbond.o