Merge branch 'master' into upstream

[linux-2.6] / drivers / ata / Makefile

diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index b183a04aeaf768546b8dd968b2c8a680faf4d2ea..e42d14dbf0370f7a0dc4d4fce2c8cbeb3b251981 100644 (file)
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -34,6 +34,7 @@ obj-$(CONFIG_PATA_HPT3X3)     += pata_hpt3x3.o
 obj-$(CONFIG_PATA_ISAPNP)      += pata_isapnp.o
 obj-$(CONFIG_PATA_IT8172)      += pata_it8172.o
 obj-$(CONFIG_PATA_IT821X)      += pata_it821x.o
+obj-$(CONFIG_PATA_JMICRON)     += pata_jmicron.o
 obj-$(CONFIG_PATA_NETCELL)     += pata_netcell.o
 obj-$(CONFIG_PATA_NS87410)     += pata_ns87410.o
 obj-$(CONFIG_PATA_OPTI)                += pata_opti.o